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

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

Change-Id: I34e10bc5799e6ef69272ca63a22487be3f8bfc70