[automerger skipped] Upgrade emulator to emu-master-dev build 8499664 am: 21ed0f6dbf am: 825ca35034 -s ours am: 7c939a4260 -s ours

am skip reason: Merged-In If8d5be99706b8a61a4b65c3f7e6e4756a159e20d with SHA-1 bdb06d2002 is already in history

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

Change-Id: Ia1c876a3af383ca1b73eeeab10119d127150f851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>