Merge changes Ibed7f4c3,I8a9f4f0b am: b1f182cbcb am: e9cc09576a

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

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