Merge "Revert "Emulator allows google apps to have access to locations by default" am: 5856865e3b am: 5cd36407df" into oc-dr1-dev-plus-aosp
am: 85c4b06a5b

Change-Id: I7f4015ca645d36a12847c7930cc5c3a4ae32471b