Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd0 am: 63d294c1 am:...

Merge changes I7df6e323,I0e3412b9 into main am: 0da62dd0 am: 63d294c1 am: 3758b9a6 am: 2723db37 am: 64063c3f

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



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