Merge changes I9ea8687e,Ia641f8ee into sc-dev am: b7a55568ed

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

Change-Id: I122425541698c3d2474a9e83646e99608e59897d