Merge changes Ie1b0c687,I4e6dfdfa,I2da14a56,I47041785,I34388f76, ... into main am: 57220562b0

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

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