[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 97aaa7fa -s ours am: a9dbc49e -s ours am: 7769e9f1 -s ours am: 80ad01c3 -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: I2a65c171a83523942fe6a46dafbbcc1a710141ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>