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

[automerger skipped] Merge "Merge Android 13 QPR2" am: 487d87ca -s ours am: a42c944a -s ours am: 35074419 -s ours am: c2a47ea6 -s ours am: 1e0d860d -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: I908bc1a23db0dc7d5ea4d645bdde703fb64e4a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>