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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie57557ba29ac8a8ca7827ed039817b6c75c1b0d6