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

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

Change-Id: Ie5cb3aa608b3c16830f13a844608255d31306cb2