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: d370a216 am: b5703fa6

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



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