Merge changes Id6f4b1a4,I2bec024d am: 9adf6fa9e6 am: 55577f4f62 am: 99faaaf56b

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

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