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: I770c7f0e0ea267d37bc3af161127e9c13c485124