Merge changes from topic "am-4938c65df36346d28994d2ded5a116ab" into android12L-tests-dev

* changes:
  Merge changes from topic "am-5c39dcf2db604d5cbc65f245e4891279" into android12-tests-dev am: 6b8993a59d -s ours
  [automerger skipped] Merge changes from topic "am-89cd132c1b4e4f65869252a51284ce52" into android11-tests-dev am: 39fab3351b -s ours am: 0aa9e6abe2 -s ours