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

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

Change-Id: Ie40eed9cc5b920416c8014e2b7456bf3384a4b91