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

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

Change-Id: Ia8825424322b14f1c0c48179de0a578422d80986