Revert "Emulator allows google apps to have access to locations by default" am: 626b5a3312
am: 8abe100d23

Change-Id: I07e2d01e89638fd289550ded8e4412e66368de6f