[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5c768f6614 -s ours am: 98bd215af3 -s ours

am skip reason: Merged-In I6bfdc5e2aa4185e84ac79eb084fa8266ac467072 with SHA-1 a5dd19b8cd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/common/+/16843587

Change-Id: Ibd157a982776db50de3aa71e33f9c3445324bfb0