[automerger skipped] Merge "Merge Android 12L" am: 0f839e536d -s ours am: 63bfd9364c -s ours am: 54c5abdbe6 -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: Ic5bdf38c2ae9d8a50510b23c1091c6f5b6143eaf
This commit is contained in: