[automerger skipped] Merge "Merge Android 12" am: c03b0fa0 -s ours am: c259e668 -s ours am: d8cfdda3 -s ours am: 8896ccc0 -s ours am: b843d5c5 -s ours

am skip reason: Merged-In Iba1443da42161f4a41830081f2e1985b30444cc0 with SHA-1 ee05ff24 is already in history

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

Change-Id: I7053ceb684d54f5ac0cc5da94ae87c2ba7a77267