Merge changes I5809456a,I87719e22 into main am: 6ca358ede0

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

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