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

am skip reason: Merged-In I25cdf649702b766d62b82da3bd3f752fc1344595 with SHA-1 0bc14d9726 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/r8/+/16844193

Change-Id: I1e79c8ec5a35e2fe5d08ea7f82442b768f06a445