Merge changes from topic "am-3c58e23b974840d3941b861caf9b346f" into android12L-tests-dev

* changes:
  [automerger skipped] Merge "Fix platformDefaultTlsProtocols()." into android12-tests-dev am: e535f1761c -s ours
  [automerger skipped] Fix platformDefaultTlsProtocols(). am: 6d0d0a3521 -s ours