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

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

Change-Id: I6800e52f69259a030b683c9aef42c814ac71f602