[automerger skipped] Upgrade emulator to emu-master-dev build 6629878 am: f5e1c21102 am: 7674f8d13c am: 8f23da8086 -s ours

am skip reason: Change-Id I1c5d6d8c5087905eaa8dcd22c07d6540bcb66fa6 with SHA-1 f5e1c21102 is in history

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

Change-Id: I8730a56916c10094c427c1d034d023a98235d18a