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

am skip reason: Merged-In I0df23c44fe384cebefcba5669544e3c1b51f106d with SHA-1 6f0d849aca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/sample/+/16843572

Change-Id: I0c4ae64ea81f6e9767fd3ef48fd0828b777ccc4c