Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: c0b3e59990

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

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