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

Change-Id: Id4342874886fea849d40bb4243ba1302a50928e5