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

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

Change-Id: I488db0944033fa879064ed8adb212ca4582159be