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

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

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