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

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

Change-Id: If744f0b470e4c16348c9216f20e2f5bdc687ae20