Merge changes I670f78af,Ie2dce95b,Ic44227c9,I5770ee41,I82d27049, ... am: a15bdb9413 am: 0e98c827b8 am: 077566d063

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

Change-Id: I30019b9497fb152e3a5304876426c406f209f955