Merge changes I07c0f96d,I8734474f am: 5440b3663c

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

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