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

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

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

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

Change-Id: I501b74e34cb677f10e6042db01fbbdf1fea40b4b