[automerger skipped] Upgrade emulator to emu-master-dev build 6946397 am: d971c541c5 am: 7a69cf790b -s ours am: 25383a4231 -s ours

am skip reason: Change-Id I784438f15a28514c56bf50d15dba6a12b7f40a1e with SHA-1 f21f51c1f2 is in history

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

Change-Id: I7f48adfb4513803755bc1b3fc242ab0a688b7a83