Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36 am: a7f2f06bd4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999

Change-Id: I348926ec96c0feea6ae941f6e7bf6aef4fd231ae