Merge changes I0b38a98a,I6f8e6ec1 into sc-dev am: 4f53440f87 am: 95631ea629 am: 1473a8d78f

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

Change-Id: I7ef159337e181bffdccf27ac6f5bb21d83d07b20