Merge "Adjust the widgets fitting algorithm to mitigate over packing issue" into sc-dev am: 96793bdfe1

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

Change-Id: I7c757d6684ba187a3995d854032311acfd0b7089