Merge changes I707ea158,Ic1c489dd,I7484b772 into main am: 1089648b97 am: cff6c7e92a

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

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