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

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



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