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

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

Change-Id: I64708a3f57a27daa694722d6019419371be22101