Merge changes I044940b6,I88b561b7 into main am: f475f91cac

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

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