Merge "Crop avatar in bouncer user switcher" into tm-qpr-dev am: 9547fef8 am: 702c3a31

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



Change-Id: I69424013b4d698355c48df9ed2af1a036345cc7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>