[Internal] Fix drawable compositing on API < 23

Author: pubiqq

lib/java/com/google/android/material/drawable/DrawableUtils.java

@@ -241,9 +241,9 @@ public static Drawable compositeTwoLayeredDrawable(
    * @param bottomLayerDrawable the drawable to be on the bottom layer
    * @param topLayerDrawable the drawable to be on the top layer
    * @param topLayerDesiredWidth top layer desired width in pixels, or {@link #INTRINSIC_SIZE} to
-   *     use the intrinsic width.
+   *     use the intrinsic width as the desired one.
    * @param topLayerDesiredHeight top layer desired height in pixels, or {@link #INTRINSIC_SIZE} to
-   *     use the intrinsic height.
+   *     use the intrinsic height as the desired one.
    */
   @Nullable
   public static Drawable compositeTwoLayeredDrawable(
@@ -258,8 +258,6 @@ public static Drawable compositeTwoLayeredDrawable(
       return bottomLayerDrawable;
     }
 
-    boolean shouldScaleTopLayer =
-        topLayerDesiredWidth != INTRINSIC_SIZE && topLayerDesiredHeight != INTRINSIC_SIZE;
     if (topLayerDesiredWidth == INTRINSIC_SIZE) {
       topLayerDesiredWidth = getTopLayerIntrinsicWidth(bottomLayerDrawable, topLayerDrawable);
     }
@@ -300,10 +298,9 @@ public static Drawable compositeTwoLayeredDrawable(
       drawable.setLayerSize(1, topLayerNewWidth, topLayerNewHeight);
       drawable.setLayerGravity(1, Gravity.CENTER);
     } else {
-      if (shouldScaleTopLayer) {
-        topLayerDrawable =
-            new ScaledDrawableWrapper(topLayerDrawable, topLayerNewWidth, topLayerNewHeight);
-      }
+      topLayerDrawable =
+          new ScaledDrawableWrapper(topLayerDrawable, topLayerNewWidth, topLayerNewHeight);
+
       drawable = new LayerDrawable(new Drawable[] {bottomLayerDrawable, topLayerDrawable});
 
       final int horizontalInset =