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

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

Change-Id: I63490c28d679f9a57be5b09d1503aaca23fcd0c9