[automerger skipped] Merge Android 14 QPR1 am: c8a041c524 -s ours am: 6734490de1 -s ours

am skip reason: Merged-In I343a1e01dad2db510a57345b6f432af1a519bdcb with SHA-1 caa8cb4c69 is already in history

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

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