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

Merge "Merge "Support setting primary provider" into udc-dev am: d07c89db am: 23c6f5e3 am: 99cd0f36" into udc-qpr-dev-plus-aosp am: 24bd6cad

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



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