Merge changes Ia90c6390,I5b3ed1b8 into sc-dev am: 9581a89057

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

Change-Id: I5156384cde731a7dc8f6e7cfb230bb8188fd1368