[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: dc555c19 am: 760c0393 -s ours

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

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



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