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

Merge "Properly handle disabled location prefetch." into udc-dev am: 44d9e63f am: 2aa7189c am: 58e14e89

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



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