Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830cb8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf337d347c30f5b34bac2fe86fd55a142d2a3647