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

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

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



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