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