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

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

Change-Id: If357e1ed1924ea52530d2ed5de363469f99b85ec