Merge changes I044940b6,I88b561b7 into main am: f475f91cac am: 77096c066e

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

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