[automerger skipped] Merge Android 13 QPR1 am: 603e866896 -s ours am: b2796a1bf1 -s ours am: 34e3e94462 -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: Ic4e6ebd4952ceb4377aa7fa1fb7a3f52c468b458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>