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

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

Change-Id: I9991d503560184eea250bacd7400d24ecd33e56b