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

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

Change-Id: Ic57a4d83bb8efe6f5c2004f17f5b3ca118ba5181