[automerger skipped] Upgrade emulator to emu-master-dev build 6855416 am: b96384ba92 -s ours

am skip reason: Change-Id If90ad8ebda8504c7c59185a8f24b98b565737aa3 with SHA-1 ea0dd96967 is in history

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

Change-Id: I1c213cf9a269829a870a21f54b005f36f9eb2af6