Merge changes I9fd5e4cb,I59872b1a into main am: 66f0636c0e

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

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