Merge "Refactor GridSizeMigrationTaskV2" into tm-qpr-dev am: ad932045ac am: ff521c99ad

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

Change-Id: Ic7a3f0ac4db6facf7ce17208133bf6b85dc25644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>