[automerger skipped] DO NOT MERGE: Do not inject mock location to chipset am: c59cbd13f6 am: 77fa00f38f -s ours am: 691ae7772d am: 3e7e30265b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4faf0e64d3fd57823b6472ee52ca3b8fa2946c1