Merge "Upgrade emulator to emu-master-dev build 8681204" am: 3d1a0c38e8 am: 5b58769167 am: 3698d70d7e

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

Change-Id: If0fb7b89cdc6ccb375ed956e117ad87efa90244d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>