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

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

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