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

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

Change-Id: I41c76355b427055e8d87fbc2388176fe2c6c0f7d