Merge "Fix bug in getting enabled providers" into udc-dev am: 35b0657c

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



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