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

Merge "Fix guest icon is not clickable after adding user" am: a3591782 am: f9fb9f69 am: db5bc807 am: fd9473a0

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

Change-Id: I51c5114750ee1a64ec564204667c72e13ae98d4e