[automerger skipped] Merge "Merge Android 12L" am: 0f839e53 -s ours am: 63bfd936 -s ours am: 54c5abdb -s ours am: eaf34095 -s ours

am skip reason: Merged-In I2bf469307acd968bf4faa789a9325173d6351c1d with SHA-1 19929dff is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2012639

Change-Id: I2e0e8d09906fa3d6b05626a15fbabb630e3bd330