commit ce7f91e974eafe6fe14b8acb7a0861221d3c0869
author bohu <bohu@google.com> Sat Jun 03 23:31:59 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 27 22:33:43 2017 +0000
tree 26b8800dfd9cc1dbf5f356fba0bdaf70819ac449
parent afd351c4447c88c8f859e090c1bea4272e9242a8

Revert "Emulator allows google apps to have access to locations by default"

The SdkSetup apk is included by AOSP images and it should not
refers to google apks.

We need to figure out different way to fix the original GTS failure.

BUG: 62292257

This reverts commit fb743d8db6e755e98251e6509a09aed6d51f76d4.
(cherry picked from commit 03f4e91d52fbd994e0c11ddf537ad767e8c14bde)

Change-Id: I87c4dcefc6b51890d4edcd2749eee2fbdb7fc8a0
(cherry picked from commit 5856865e3b44fa22424516b19663ce751d6e9605)