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

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

Change-Id: Ie792954edf45ebb469f0cfcf360eca125c049782