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

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



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