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

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

Change-Id: Ib8b8e501fd51beee21416b1b75eaf1a8a2083cd5