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

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

Change-Id: I3913200cbdee26903a068aede62873bf3ec19804