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

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

Change-Id: I4dc6217a69ee32ac01fd36c2f45640301c6abe76