Merge changes I0b38a98a,I6f8e6ec1 into sc-dev am: 4f53440f87 am: 00487b339f

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

Change-Id: I73aaee43e46ffa89be1f4a73b2c3ad88853056b3