[automerger skipped] Merge Android 13 QPR2 am: f9a794c359 -s ours am: 052584b1b5 -s ours

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

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

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