DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13358223

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia56381d103931a932e1a3e08d6baa949d2ee864f