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

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

Change-Id: Ibd26999f70113c8c16eea705c498367275231b8e