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

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

Change-Id: I0a897d6650f4b58ac4fb8594798c07cabec968b9