Merge changes I32ad8ad2,I86047955 am: 6d454d5f28 am: 399e7b3298 am: ed14339954 am: b70c6adc56 am: 3461186d32 am: 5fe010931f

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

Change-Id: I0763bfcfafd9eabc465138e37150af5afadd9388