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

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

Change-Id: Icbc5bc757ba029a4d9969a01d1c3525000902370