Merge changes Ibfb6a54c,Ifa0f95fd am: 4af9762ef7

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

Change-Id: I0b8fe87e85f26ef54865792cceded06ba68f7218