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

[automerger skipped] Merge "Merge Android 12 QPR1" am: c328fab9 -s ours am: a950e8bb -s ours am: 8684f37c -s ours

am skip reason: Merged-In I67a05a55a122341a7c33d3eefdcc436d94e29a15 with SHA-1 af5fc3ca is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1921401

Change-Id: I132fa8552772224cde14341a1aadf5375810180f