Merge changes I3f440a75,I5566a1ef into main am: 9820d5d5ad am: 33e767ffea am: 576da5416e

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

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