[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: 579b74d5cb -s ours am: 5f1b131c67 am: 95ff5252f2 -s ours am: 4fa14bd295 am: 12eff0a57e -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I838476cb05412824aea5f8af7c3e166415ceccd2