Merge changes from topic "am-3e05d71f14954bc1afbc82c7e8574e25" into android12L-tests-dev

* changes:
  Merge changes from topic "am-afab3f17223242c0a4f1d3129aa969b4" into android12-tests-dev am: e0d19eeaca -s ours
  [automerger skipped] Merge changes from topic "cherrypicker-L79400000963198033:N98100001408188145" into android11-tests-dev am: de77b20c18 -s ours am: 36fc297797 -s ours