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

Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev am: 8652415a am: 14102381 am: 94d3e7af am: 3acc0df0

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

Change-Id: I7da729c1ffea3bf716474cffb939867c6aae10ef