Merge "Ensure primary provider is contained in the list of enabled providers"...

Merge "Ensure primary provider is contained in the list of enabled providers" into udc-dev am: 8587f769

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



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