Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d am: 3f3c7b77 am: 3a8d2b2f

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

Change-Id: Ied1417c52d830ffbee91b06093563f431bffe389