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

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

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