Merge changes Ia7d1cdff,I55d1df7e into main am: 1d8ecc054d am: 62dc307dcc

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

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