[automerger skipped] Merge "Fix include location data to check for coarse...

[automerger skipped] Merge "Fix include location data to check for coarse location first." into tm-dev am: f8e43432 am: 6b41f01b -s ours

am skip reason: Merged-In Id277d16aceb58324ec70eadfcd3fb871821707c9 with SHA-1 22ca59c4 is already in history

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



Change-Id: I6e2ba9df8f6c366c3b738eb34d3d4ff697dc6ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>