Merge changes Iee37bb97,If7c549b8 am: 83ea817a8c am: edd8ea3ff6

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

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