Merge "Remove temp logic added to migrate users to new 4x5 grid." into sc-dev am: 70938389d6 am: c3df7e58b6

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

Change-Id: Id6fa9a8acbeb75fe3cc57bb7b024d4794f9d1aaa