Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8 am: 8226694fcf am: a8a4cb0028 am: 7c42f5c1c7 am: a2fc831f9a

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

Change-Id: I82624df2a3a4e2743bb410da980d5f1edaa1cc50