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

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

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

Change-Id: Ia581d51159f495f3762deeee7ab7daa9dda6932e