[automerger skipped] Merge "Merge Android 12 QPR1" am: 6b129e3b -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR1" am: 6b129e3b -s ours am: 86937b33 -s ours am: c855464b -s ours

am skip reason: Merged-In Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7 with SHA-1 655d7f9857 is already in history

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

Change-Id: I11136e25a0d64f14ca4328100fd93d597a1ecf8b