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

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

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