Merge "Skip iconScale logic in responsive grid" into udc-qpr-dev am: baf96f7487

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

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

src/com/android/launcher3/DeviceProfile.java

@@ -886,6 +886,10 @@ public class DeviceProfile {
         updateIconSize(1f, res);
         updateWorkspacePadding();
 
+        if (mIsResponsiveGrid) {
+            return 0;
+        }
+
         // Check to see if the icons fit within the available height.
         float usedHeight = getCellLayoutHeightSpecification();
         final int maxHeight = getCellLayoutHeight();