Merge "Upgrade emulator to emu-master-dev build 6935186" am: 981b0fb436

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

Change-Id: Ie4847a106772c41e4af3bc46904cffa568395dbf