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

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

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

Change-Id: I6e317a5b9dda4bdc5b2fea94330d4b94ec8b043f