Merge "Fix issue where location_hardware_provider is delivered through the...

Merge "Fix issue where location_hardware_provider is delivered through the passive provider" into udc-qpr-dev am: 262dc8d7

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



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