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

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



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