Merge "Fix repeated empty workspaces after changing the grid size." into tm-qpr-dev am: 1f7b2f9a7a

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

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