[automerger skipped] Merge "Merge Android 13 QPR2" am: b25a156d0f -s ours am: febe993e58 -s ours

am skip reason: Merged-In Ia275a2ab69ee31b7d81a2ca8c83bef08cbf107df with SHA-1 0d7a50767b is already in history

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

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