Merge "Set the primary provider list to UI" into udc-dev am: 6bcbecdd am: a4302436

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



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