Merge "Make grid size migration less confusing for users." into tm-qpr-dev am: 33c348f5

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



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