Merge changes Ibed7f4c3,I8a9f4f0b am: b1f182cbcb am: e9cc09576a am: 3a2f4fb51b

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

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