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

Merge "Fix bug that filters out system providers" into udc-dev am: b23ec972 am: 5f3e714b am: 6ef926c3 am: 7a3b4d49

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



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