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

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

Change-Id: Id4aeba766375e02479084bd398b4f10c7e58244a