[automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436d1
-s ours
am skip reason: Merged-In I92acad938d79e21b45af99cc76ff411022b61f1b with SHA-1 ae871ba823
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17070265
Change-Id: I2bd60aa4b87b336706872e3eeebc938f6fe987be
This commit is contained in: