[automerger skipped] Merge Android 14 QPR1 am: 3a00bdb9 -s ours am: 7fd104c1 -s ours

am skip reason: Merged-In Id9f746bc66671d274afaedb10854d88123a04af0 with SHA-1 b1e0c41c is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2865975



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