Merge changes I07c0f96d,I8734474f am: 5440b3663c am: a629baedb9

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

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