Merge "Reorder the passkey username & displayname" into udc-dev am: 9e6a4d41

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



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