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

Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a62111

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



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