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

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

Change-Id: I72de49d2efd13e19160a5387bd7947e111e5aa27