Revert "Emulator allows google apps to have access to locations by default" am: 5856865e3b
am: 5cd36407df

Change-Id: I047433b93d5a00949ba1da0be8d014876d3bec52