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

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

Change-Id: I0b9f0c874b4a58723bc455755b866e3ce8af6e5b