Merge changes I32ad8ad2,I86047955 am: 6d454d5f28 am: 399e7b3298 am: ed14339954 am: b70c6adc56

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

Change-Id: Iea0930bbc2514f1156d9fb7dd9f9cd4e01359040