Merge "Upgrade emulator to emu-master-dev build 6289500 am: 4136d515b5 am: 77042e800d" into rvc-d1-dev-plus-aosp am: 61499ee701

Change-Id: Ib96c283dd076e03e0426119d6907aa07a91b2ad8