[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 am: 3e7e3026 am: 557954f5 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b7669b701641bb79964a13037289348b9c9489d