Merge changes I10c4beea,I0efc30f3 am: cad5403270

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

Change-Id: Ia8bfbf703e25572678fba6a92f42e018ffb5ace4