Merge "Reorder widgets no longer overlaps when no space is available" into...

Merge "Reorder widgets no longer overlaps when no space is available" into tm-qpr-dev am: e2334d76

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



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