[automerger skipped] Merge Android 14 QPR1 am: 620c66bc99 -s ours

am skip reason: Merged-In I05a5865b2ee13be65e16a8a0bcdc58fc33e4d461 with SHA-1 249f348c59 is already in history

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

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