Merge changes from topic "am-79e52fb1da4842749d8aff189d23a029" into android12-tests-dev

* changes:
  [automerger skipped] Merge "Luni URLConnectionTest: Don't depend on TLSv1*" into android11-tests-dev am: d32caa0e58 -s ours
  [automerger skipped] Luni URLConnectionTest: Don't depend on TLSv1* am: aea1bf0d5f -s ours