[automerger skipped] Merge Android 12L am: 7e916e36c7 -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: I1f52f754ba77322a6f2c2e1c20f0b894f90ca042