Merge "Fix guest icon is not clickable after adding user" am: a35917822d

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

Change-Id: I4f9139038774c222ea722af4607fe1e798eeb852