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

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



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