Merge changes Id6f4b1a4,I2bec024d am: 9adf6fa9 am: 55577f4f am: 99faaaf5 am: b04aba29 am: 4daa9620

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



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