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 am: f2b8b4bb

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



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