[automerger skipped] Merge Android 13 QPR1 am: 603e866896 -s ours

am skip reason: Merged-In Id5cff8223ad6f0463caf9a81e21e40317ada2d23 with SHA-1 215468a1f4 is already in history

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

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