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

Change-Id: I7f4e302508e503b9eb788a9ad4809a103b519093