[automerger skipped] Upgrade emulator to emu-master-dev build 6295583 am: 8ff285a0a2 -s ours

am skip reason: Change-Id If62711ee94e43bbf499d9ae0b65c595619856386 with SHA-1 5b8315ad29 is in history

Change-Id: Idc0bae87e2ffaa2c5c8e50d28d55de1f16f5c830