Upgrade emulator to emu-master-dev build 6946397 am: f21f51c1f2

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

Change-Id: Ia3a4ea97e564bcaba6dc4a67790a30dd87938472