Merge changes from topic "am-a484a39e98954643a9144940c8ff7fec" into android12L-tests-dev

* changes:
  Merge changes from topic "am-f116f6daf3bd4f109638f1ee3d9e2bd2" into android12-tests-dev am: b52640372e -s ours
  [automerger skipped] Merge "Fix platformDefaultTlsProtocols()." into android11-tests-dev am: 4e14ceb972 -s ours am: 322c101d14 -s ours