Merge changes Iae9f692f,Ib43f1cb6,I9d4f0c30,I7d06ea35 am: 5f14bad22c am: b9aff55ad9 am: 6109e931d9 am: ebab2cdef5 am: 1fb34517fc

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

Change-Id: Id84736e9ef21fb82f3905204498700ffb56c0390