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

am skip reason: Merged-In I9607ffb85c87bef7bbbd3f8a9986d4e8ac03fa9f with SHA-1 40003c755d is already in history

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

Change-Id: Icd223e0c0c2a155615d29464ed4fcc0b5ddeb8bc