Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a

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

Change-Id: I05f40676fab082d6a1a252986fe40dd5e2cab5e5