Merge changes Iefd406fc,I0f6cfbda into main am: d6c8a4b38e

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

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