[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6e7bed7666 -s ours

am skip reason: Merged-In I1ddf719e205c89733d1c6698e8eb90bc4f79b408 with SHA-1 39331f466f is already in history

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

Change-Id: Id10e6627ad50e80bab0078c860ecbcf4bfa2ac0d