[automerger skipped] Fix Guest string was not translated in UMS.userWithName()...

[automerger skipped] Fix Guest string was not translated in UMS.userWithName() am: d03224f3 -s ours

am skip reason: Merged-In I2745aed0ea722765a11c6da40fb4159146da54c7 with SHA-1 c556777c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070443

Change-Id: I6fbd8b0d2a8e707f4efce2dfe4878c51faa0a22c