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

Change-Id: I3c1966652bc5c23fd00c982b0f9a065e0283e8d2