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

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



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