Merge "Changed output of get-main-user." into udc-dev am: 570023b2

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



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