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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e6828c71c216c14e95dc7ab921ec84c70779d36