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: 25f9b31a am: 6b23762e

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



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