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

Change-Id: I8ddbd1e04421c8eb4cc55aacbf57f494f9065726