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

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



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