Merge changes I33036387,I63ca8d29 am: aedb92d5af am: 5455f2dc13 am: dfff9c74f1 am: 50bfda41d2

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

Change-Id: I3e3f8dd804eb00216bd9da1897bcc1df9495f2e2