Merge "Fixing GridMigrationTask tests" into ub-launcher3-dorval-polish
am: b715701554

Change-Id: Ia2417383fa4334fd114a9bc368ea5472293f52f2