Merge "Merge "Fix quick settings user switcher avatar shape issue." into...

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

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

Change-Id: I02f65da70bce6d902861dca4953b9e6bcbc8fdcb