Merge changes from topic "am-6929ab6471d048d9846f4a3bc2a660de" into android12-tests-dev

* changes:
  Merge changes from topic "am-57801a1b8b2141b1ae1977cb9589d7d3" into android11-tests-dev am: 8980d1c9ba -s ours
  [automerger skipped] Merge "Let OS choose free port in MembershipKeyTest." into android10-tests-dev am: ca27adde8d -s ours am: d9e891aa50 -s ours