Merge changes I924d6fc8,Iee20a2b1,I4070aade,I55331da0 into main am: ac3f49f34b am: 49d2deaa7c

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

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