[automerger skipped] Merge Android 14 am: 0321b51e -s ours am: 7662973b -s...

[automerger skipped] Merge Android 14 am: 0321b51e -s ours am: 7662973b -s ours am: 5f94f8e3 -s ours am: 90bb6c4c -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: Id7bb307639b1aa5ebb44856ca8e4536c90a2c160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>