Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8

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

Change-Id: Ie1a7951c7b3a6fc5d7978ece75c1791efac95029