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: ac23a7fb am: 7f174397 am: b2a03b2d

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



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