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

* changes:
  Merge changes from topic "am-79e52fb1da4842749d8aff189d23a029" into android12-tests-dev am: e4b2194520 -s ours
  [automerger skipped] Merge "Luni URLConnectionTest: Don't depend on TLSv1*" into android11-tests-dev am: d32caa0e58 -s ours am: fcde107780 -s ours