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

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

Change-Id: I32f994167761b5bd2c1136d9ac64e8c730f92bbf