Merge "Revert "Reorder widgets no longer overlaps when no space is avai...""...

Merge "Revert "Reorder widgets no longer overlaps when no space is avai..."" into tm-qpr-dev am: 3d24f673

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



Change-Id: Ic53020d90f3056f3d3c686b4d5e55743c46c766b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>