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

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

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



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