Merge changes Ia7d1cdff,I55d1df7e into main am: 1d8ecc054d

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

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