[automerger skipped] Merge Android 13 QPR2 am: 24e88de3 -s ours am: cb3cdfb2 -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: I317ea1624ab29b549ed2aeb2a467bc5738bed478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>