Merge changes Iac870a24,I74afe105,I7db17475,I1e0cd95f am: bf3f93bbf4 am: 5960c25ade

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

Change-Id: I0c6b33f07e217ac69e0c87f5521cf35597b65495