[automerger skipped] Merge changes I9ea8687e,Ia641f8ee into sc-dev am:...

[automerger skipped] Merge changes I9ea8687e,Ia641f8ee into sc-dev am: b7a55568 am: c90af903 -s ours am: c96417b8 -s ours

am skip reason: Merged-In I9ea8687e0c9e89140bcddfefcc2a6177c99b2e4d with SHA-1 c14f3221 is already in history

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

Change-Id: I0ca877bbeca368fbc2f6b02fc7be38a05e79cb61