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

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

Change-Id: I68204321fb507d79bb809fa5c0dab5c4f1678ec1