[automerger skipped] Merge "Merge Android 13 QPR1" am: 6b64fd4b02 -s ours am: 4e3f7fdc45 -s ours

am skip reason: Merged-In I5be6e32d05aa219ae787cb5a3242a2cc4f9e87f4 with SHA-1 d97284de03 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2337855

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