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 am: 54bed41a am: 36c3a7af

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



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