[automerger skipped] Merge "Merge Android 12 QPR 3" am: 099a4648 -s ours am: 53182e4f -s ours

am skip reason: Merged-In Id06010e4a12be1139ac8883c782e882265dce7cd with SHA-1 d5a68b47 is already in history

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



Change-Id: I795f4cdc3e6f1a7d47a58bdede0557be14acbb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>