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

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



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