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