Merge "Fix include location data to check for coarse location first." into tm-dev am: f8e43432

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



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