Merge changes from topic "am-eea3e96d84c34ba68e8c9263fc0b0332" into android12L-tests-dev

* changes:
  Merge "[automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours" into android12-tests-dev am: f414cb356b
  [automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours am: 6c706660e9 -s ours