Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c

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

Change-Id: Ic74b543e4fb94ab377472cb5d8e25fe449818081