[automerger skipped] Merge changes I10c4beea,I0efc30f3 into sc-dev am:...

[automerger skipped] Merge changes I10c4beea,I0efc30f3 into sc-dev am: bb2b88ae -s ours am: 3a0db9b8 -s ours

am skip reason: Merged-In I10c4beea28387eecfd0bc7c5dfd59a1b66fec21e with SHA-1 59cae644 is already in history

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

Change-Id: If5e5bd137b452946b9898abce88bc7156fc3d4ea