[automerger skipped] Merge "Fix Guest string was not translated in...

[automerger skipped] Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev am: 9f54f436 am: caf7556e -s ours

am skip reason: Merged-In I92acad938d79e21b45af99cc76ff411022b61f1b with SHA-1 3fc4642a is already in history

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

Change-Id: I3c84dac09527213021a2c2ff505b0c717754db56