Merge "Bug fixes for the create flow auto select." into udc-dev am: c58528f3...

Merge "Bug fixes for the create flow auto select." into udc-dev am: c58528f3 am: 9f64db50 am: de6758ae

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



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