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

        }

        UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);

        Bitmap icon = BitmapFactory.decodeStream(avatarDataStream);

        Bitmap decodedIcon = BitmapFactory.decodeStream(avatarDataStream);

        CircleFramedDrawable drawable = CircleFramedDrawable.getInstance(context, decodedIcon);

        Bitmap icon = UserIcons.convertToBitmapAtUserIconSize(context.getResources(), drawable);

        um.setUserIcon(userId, icon);

        try {

            avatarDataStream.close();