Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c am: b9aff55ad9

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

Change-Id: Ib1a182ec0b8b2f8d5971747eac4ed67c4b0beb24