[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: 579b74d5 -s ours am: 5f1b131c am: 95ff5252 -s ours am: 4fa14bd2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28516cee1126e2e73d8de806b7c53354c3783428