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

[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 31255052 -s ours am: 5b873dc7 -s ours

am skip reason: Merged-In Id9e06f88539b59480d5cf57a4ba67cef4676c1d5 with SHA-1 4847855f is already in history

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

Change-Id: I72650441a825243a64a72117fafb565fda5671fc