Merge changes from topic "am-27d0248ce6d64a62aee4f270e6eae1cf" into main

* changes:
  Merge changes from topic "am-92def43caac0462a8e67863e0310a4b5" into android13-tests-dev am: 5355dd1224 -s ours
  [automerger skipped] Merge changes from topic "am-21ce8922bf5e498bb030b1c2a53f476d" into android12L-tests-dev am: e37b15ad16 -s ours am: 71720334f7 -s ours