Merge "Improve V2 grid migration algorithm" into ub-launcher3-rvc-dev am: ef474d2959

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

Change-Id: Ifdcce3871d4bb5901b07b29265ab5c44e407a102