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

Change-Id: I3a72cf7169bfb76e2912c1c244f908cf3a259a55