Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03

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

Change-Id: I20b44fb89dd6c9530f920a4bec9fea53ac6b830a