Merge pull request #21478 from jrose-apple/5.0-conditionally-retro

[5.0] [ABI] [Mangling] Disambiguate protocol-conformance-ref better