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

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

Change-Id: If85253c1d6ed28e12cf3f8156e83c6f8eb7c14d4