[automerger skipped] Merge "Merge Android 13 QPR2" am: ac37afef -s ours am: 98625087 -s ours

am skip reason: Merged-In Ic7e102201196285cba18e12e27c7cd4d40dcc8e4 with SHA-1 95f91979 is already in history

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



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