Merge "Fix Multi user avater View overlap privacy dot" into sc-dev am: a0178237 am: 6c6a3b63

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

Change-Id: I50a66a9d4243fabf39e22da99c1b16f877303248