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: I04ad706371f3547d72d0e8814507699d575ee360