Remove frame and shadow from CircleFramedDrawable

Also change the size the circled icon is drawn into to a 40dp by 40dp rect.

Bug: 18198624
Change-Id: I66d919a2f35ede614a90a423d2967a4c3bc18169
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6517ffe..678e05f 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -919,7 +919,8 @@
                 return CircleFramedDrawable.getInstance(context, icon);
             }
         }
-        return UserIcons.getDefaultUserIcon(user.id, /* light= */ false);
+        return CircleFramedDrawable.getInstance(context, UserIcons.convertToBitmap(
+                UserIcons.getDefaultUserIcon(user.id, /* light= */ false)));
     }
 
     /**