Merge "Fix user icon visibility bugs" into sc-dev am: 16d25c70 am: b59a268c

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

Change-Id: I99cde8c77377bd5c1f0f8e198bafa394e965808a