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

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

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



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