[automerger skipped] Merge Android 14 QPR1 am: b1151d6612 -s ours am: d6e1c3c632 -s ours

am skip reason: Merged-In I78eb22bdbe6ea648c65301f8e55ed5a2a0037a76 with SHA-1 a7d644ee9c is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel/+/2865781

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