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

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

Change-Id: I289213be787f323be43d5d59dc544c59ace1c28d