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

Change-Id: Ie0322daceddd1d563efcd42cb21b9b810fd19d48