Merge "Merge "Properly handle disabled location prefetch." into udc-dev am:...

Merge "Merge "Properly handle disabled location prefetch." into udc-dev am: 44d9e63f am: 112ff532" into udc-d1-dev-plus-aosp am: 765ad240

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



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