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

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

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



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