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

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

Change-Id: Id2a27ad252b3be7407238075d27232b7204f6392