Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to...

Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587d am: 71d20b0e

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



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