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

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



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