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

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



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