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

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

Change-Id: I59a6160ca69dc7c476973d9c6bf5a2495cc5a694