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

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

Change-Id: I84c1a36a13fe9c91e64e42fe1ffa8a8a4bdbc62d