Merge "Fix bug in disabled providers in create flow" into udc-dev am: c293fb11

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



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