Upgrade emulator to emu-master-dev build 8311694 am: e617720a53 am: f2f207c5b6

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

Change-Id: Ibb169ad84f34d730cb4b3527496a4aa9384d1c30