Merge changes I670f78af,Ie2dce95b,Ic44227c9,I5770ee41,I82d27049, ... am: a15bdb9413

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

Change-Id: Iaf2e40784ce2b69a57b2595da0990fe97e63a105