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: 14102381 am: 6e0221d5" into rvc-qpr-dev-plus-aosp am: 501d0473

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

Change-Id: I97aedb734771e0d47e5146d3f2d5a89f26855efc