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

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

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



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