Merge changes I3f440a75,I5566a1ef into main am: 9820d5d5ad am: 4eb1fd8e77

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

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