Allow 2x2 and 3x3 to be migrated after restore am: 238aaee059 am: 7ca1aba4e6

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

Change-Id: I9fbcb691e088fb02194c4d50c3bd0a9b3b36a6b3