[automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to...

[automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev am: 9023676d -s ours am: f0e5190e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib523279b657b5c1187c98fa72457bd2679dbcac9