Merge changes Ibed7f4c3,I8a9f4f0b am: b1f182cbcb

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

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