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

Merge "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""" into udc-dev am: 356aa61f

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



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