[automerger skipped] Merge "Merge Android 13 QPR2" am: 487d87ca -s ours

am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 87c10e7b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2487177



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