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

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



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