[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: bb673791 am: d3163be2 -s ours

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

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

Change-Id: I2968f501009d52c28feaff2b1ed4477db1f61f88