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

Merge "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" into rvc-qpr-dev-plus-aosp am: e145c998

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

Change-Id: Ibbcd31bf52177fb5a6b350f4298ee7c1d2156d17