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: Ibf39c2d70eee9872e32394797e6899e38fe7b40f