[automerger skipped] Merge Android 13 QPR3 am: ba60819b -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: I108c15f3a2cde408e7c8269528b09d0c484214f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>