[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 523ffeeaa9 -s ours am: 380584f42c -s ours

am skip reason: Merged-In I380f238cf6106b9cf2e2cb94ae0620deeaacb987 with SHA-1 41823664d6 is already in history

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

Change-Id: Icc2efaed719df59d64d7d42bb0cdf6cba10f5f0e