[automerger skipped] Merge "Merge Android 13 QPR1" am: 162c56b5 -s ours am: 45f5d8ec -s ours

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

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



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