[automerger skipped] Merge "Merge Android 14" into main am: a7371412 -s ours...

[automerger skipped] Merge "Merge Android 14" into main am: a7371412 -s ours am: 742724c8 -s ours

am skip reason: Merged-In I2cb5194acbe64d7d64cca9b245b26ca5fbac35d4 with SHA-1 f850de67 is already in history

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



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