[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours am: 5f1b131c67

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I528216f95304feb46f2347f88c8d8022f1304b12