Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8 am: 8226694fcf

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

Change-Id: I1e13b6c6ca3a8a1dac8e1e89f9ceaa03986a0900