Merge "Fix include location data to check for coarse location first." into...

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

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



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