Merge changes I15075455,I03f322e8 into main am: 1cb6465c10 am: aa1b56973e

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

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