Merge changes from topic "am-13232a2c99cf4106951bdfe672c86a25" into android12L-tests-dev

* changes:
  Merge changes from topic "am-f344b7db2bbc4d82879899481f3aa5c5" into android12-tests-dev am: 20371f9e1d -s ours
  [automerger skipped] Merge changes from topic "am-fa89c12ff1e143b2974418def3918b8c" into android11-tests-dev am: 00b990b375 -s ours am: 3591750407 -s ours