Merge changes from topic "ch_hal_v4" into main am: 75e2b44508

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

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