Merge changes Id6f4b1a4,I2bec024d am: 9adf6fa9e6

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

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