[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am:...

[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13 am: 77fa00f3 -s ours am: 691ae777

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I204a77fcaa890c1bbf86f6eef05f875b7a114831