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

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

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