Merge "Support setting primary provider" into udc-dev am: d07c89db am: 23c6f5e3 am: 99cd0f36

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



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