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

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

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