Merge changes from topic "am-6536fbd208254e239fdf1c5f73de469e" into tm-dev

* changes:
  [automerger skipped] Merge "Merge Android 12L" am: e6953d54a5 -s ours am: 0945458d9f -s ours am: 695171b9f2 -s ours
  [automerger skipped] Merge Android 12L am: f08c6c060f -s ours am: f9c75bb6e9 -s ours am: 8b720efb2e -s ours