[automerger skipped] Merge "Merge Android 12L" am: f8d6bfd1b9 -s ours am: e7c4955805 -s ours am: 09fcb1673a -s ours

am skip reason: Merged-In I513aa15f5d655ac3fbb535797659d3654ccfec5e with SHA-1 bf674ec373 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2012637

Change-Id: I57a488c71a52a222b93cffec3e0ef02434d13309