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 am: 0eff9977

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



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