Merge changes I118b2c04,I111b72aa,Ia5d29126 am: 660e9a4c48 am: 0a8a2b9d33 am: c9b4e030ad am: c8f5cd1d5b

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

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