[automerger skipped] Merge "Merge Android 13 QPR3" am: f7752a2f2d -s ours am: 56ba098c26 -s ours am: 9eb68ad81e -s ours am: ca95f6ba2e -s ours

am skip reason: Merged-In Ic9b7f0125d86f8f144ff896e601f558707017bc9 with SHA-1 0313d5b5dc is already in history

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

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