Refactor migrateGridIfNeeded to pass the grid states and make it easier for unit testing

No-op change

Bug: 325286145
Flag: NA
Test: compiling
Change-Id: I703c08059b81e20111c17a142dc54335f18a5a87
2 files changed