Merge "Support setting primary provider" into udc-dev am: d07c89db

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



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