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

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

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