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

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

Change-Id: I748b642ce2358ea836a79701c145cdfbfb64c553