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

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

Change-Id: I4cdd0c7294f389ca57b486f018452aca3b10e9bd