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

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

Change-Id: Ib96d7493bdbcd35c9c30ac8df8c7df7cd2ff7ff0