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

Merge "Fix Multi user avater View overlap privacy dot" into sc-dev am: a0178237 am: 17d4009a am: f68bbf15

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

Change-Id: I8de0e5a8fe19d882a2f42da06ca2b0fee9c84028