[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 am: e643cc6d am: c6c62aeb -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea5a1493680f8851945d6d7670062dc8d10c6c78