Merge changes from topic "am-b7480b9a5044473a83123ed071d47e08"

* changes:
  [automerger skipped] Merge "Merge Android 12L" am: 6585bbeb -s ours am: 3573c7cd -s ours am: 6eed8154 -s ours am: bcb7f95c -s ours am: 11439606 -s ours
  [automerger skipped] Merge Android 12L am: 09b6a2fe -s ours am: fb6af869 -s ours am: 5eca7d4b -s ours am: 530f1c1f -s ours am: ad625f12 -s ours