[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622"...

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: c541e8ab -s ours am: c7cfe199 -s ours am: ff1c1d5f -s ours

am skip reason: Merged-In Ifa71accba7ecf2ab15980227a4413831cfceb187 with SHA-1 b0fefa2d is already in history

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

Change-Id: I4318006f10981ca40a197c84f522390d5b758d7b