[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: c9912fa8 -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: I5a1665d6384f8c6e5dc7868f67e3146ca9f230ab