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

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

Change-Id: Ic7edf444fd268a58d83027d3b35691d516736819