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

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

Change-Id: Ifc28b22538c20545c49ba81eb8ed7fd3331ff520