Merge "Use MaskableIconDrawable only in dogfood builds" into ub-launcher3-master

diff --cc src/com/android/launcher3/graphics/LauncherIcons.java
index 01bae0e,48f376f..8d8f3d9
--- 1/src/com/android/launcher3/graphics/LauncherIcons.java
--- 2/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@@ -157,8 -178,9 +161,9 @@@ public class LauncherIcons 
       * @param scale the scale to apply before drawing {@param icon} on the canvas
       */
      public static Bitmap createIconBitmap(Drawable icon, Context context, float scale) {
+         icon = castToMaskableIconDrawable(icon);
          synchronized (sCanvas) {
 -            final int iconBitmapSize = getIconBitmapSize();
 +            final int iconBitmapSize = LauncherAppState.getIDP(context).iconBitmapSize;
  
              int width = iconBitmapSize;
              int height = iconBitmapSize;