Merge changes Iab6235b5,I19b7d1af,I1806d8a2,I8589ef14 into main am: 61ef14ec09 am: bf0c331d59 am: ced88ce66a

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

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