[automerger skipped] Merge "Merge Android 12L" am: 0f839e536d -s ours

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

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

Change-Id: Icc5dd23784cc955b581bc885e1c99e88f7b195f6