[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: d87c244c02 -s ours

am skip reason: Merged-In I97b8a1cae0f311651dc4eb03fb9688d5e995f0ac with SHA-1 41c3bb87bf is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2992155

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