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

am skip reason: Merged-In Iaec96cd1e6134c2f87565e51e5505e7918427946 with SHA-1 30eb1d11af is already in history

Original change: https://android-review.googlesource.com/c/device/common/+/2990660

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