[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: dacfe4c9 -s ours

am skip reason: Merged-In I66a0ffd2cc6fbcf65441b19dceca6c9edea94d42 with SHA-1 5c3097be is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/SdkExtensions/+/16845423

Change-Id: Id0c5f35ff5b7412a179fe4f26782c761f19a1255