[automerger skipped] Merge "DO NOT MERGE: Do not inject mock location to chipset" into rvc-qpr-dev am: 94b4830c am: 7a606738 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib060b5bf5ea1653dba84ca0a010465ef087f6b12