Merge changes Iee37bb97,If7c549b8 am: 83ea817a8c

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

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