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: 4de87c2c am: f996bb80

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



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