Merge changes If286ae5d,I0c89907e into main am: 1de01e677c

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

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