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

am skip reason: Merged-In I24fdc745cd84e466ba9dfd5f20009ec1c43a1134 with SHA-1 65e1cd70ea is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/build-tools/+/16844344

Change-Id: Iecb5ee5293d7f4846856f0dfec84b2509d49bcf7