Merge "Fix bug that filters out system providers" into udc-dev am: b23ec972

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



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