Merge changes from topic "am-b7480b9a5044473a83123ed071d47e08"

* changes:
  [automerger skipped] Merge "Merge Android 12L" am: 559ec615 -s ours am: 664596a7 -s ours am: a5783932 -s ours am: 120cc3ad -s ours am: 6d957cab -s ours
  [automerger skipped] Merge Android 12L am: 94ce1fc5 -s ours am: c15fec9b -s ours am: f635aaa8 -s ours am: 20f6ce56 -s ours am: 2b67d65d -s ours