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: 0caf050c am: a738fec0 am: 66cf8799

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



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