Merge "Update the computation of the widget span from size" into sc-dev am: 0bb96c9168

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

Change-Id: Iabf7bc9dbb2c868c6f1548491cb240a935860267