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

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

Change-Id: I8c6aebba0b6d80d0e487092664e5e4216217984c