Merge "Ensure iconScale never exceeds 1." into sc-dev am: fab44042cb

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

Change-Id: I4adff0a4fb256e13fdbfc3056f09bb43dea01461