Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev am:...

Merge "Crop avatar to circle when syncing from Contacts." into tm-qpr-dev am: 057d24bb am: 56f9461b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20347031



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