[automerger skipped] Merge Android 13 QPR3 am: ba60819b -s ours am: 04645a8e -s ours

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

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



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