Merge "Migrate existing 4x5 and 4x4 grid users to a new 4x5 grid." into sc-dev am: 2d2f50fe86

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

Change-Id: Ic74d8a44b211fbc4bf5f46ccca5ae2243ed2d4c0