Merge changes I5809456a,I87719e22 into main am: 6ca358ede0 am: 5c9ba48ea4

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

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