Merge "Update dialog to edit user info" into udc-qpr-dev am: d267276b am: cc842458

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



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