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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bb77c57675a0e96e90b6ec86a33f804fc695e75