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

am skip reason: skipped by user rkir

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

Change-Id: Ieec7d0eccecc617ed93331cac3913d4d7666e11f