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

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

Change-Id: Ie73fd11cc3de9770364e7e34921a7642cdf4ac91