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: I99412fbc4a62a93af824159c69dc1fad9820eb94