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

am skip reason: Merged-In I0f3ee992ba1d8ad3ca84c63182fa285a1679c251 with SHA-1 b4e52de486 is already in history

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

Change-Id: Ib29fb02426689392ea3f14830f68b11fabac4c0c