Fix out-of-sync updates during grid change am: f0518bb89f

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

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