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

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

Change-Id: If8c69e75f5c7119635ab95a7b33c651cd2bed7f5