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

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



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