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

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

Change-Id: Ice72114f03ddeb657cfaec27e8d2efe424c36277