Merge changes Iaaec9a0a,I280d1424,Ic8a65044,I019cb5cf,I245d52a7, ... am: dba159dcfd am: 0bbe24d12d

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

Change-Id: Ibe0d554ca146a75db95beb7fef55949317c92ae5