Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd023 am: 63d294c196 am: 3758b9a613

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

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