[automerger skipped] Merge changes from topic "ch_hal_v4" into main am:...

[automerger skipped] Merge changes from topic "ch_hal_v4" into main am: 75e2b445 am: 9be80568 -s ours

am skip reason: Merged-In Ib6b0d5628fb8f7c88c935e61093cf3f6a3dd0e65 with SHA-1 51eba2ed is already in history

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



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