[automerger skipped] Merge Android 13 QPR3...

[automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: d221e877 -s ours am: 770e94b4 -s ours am: edbba779 -s ours

am skip reason: Merged-In I1318f21c21ec9b3fe9577ac3b9f32605e7f7f13a with SHA-1 2b1856e8 is already in history

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



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