Merge changes I5716db7c,Id83986fc into sc-dev am: d02d9f2767

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

Change-Id: I40668d021a41cdbc743517ca54bbd0889ecbbd8f