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

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

Change-Id: I5bb4b54f276bbbc6153e3639ba1222d6a3f59996