Merge changes I392933f8,I5e4da0c3,I2134b15e into main am: f0ad731bb9 am: dc432d502c am: 7eedbb1e9e

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

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