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