Merge "Fix missing grid for devices that upgrade from R" into sc-dev am: db46688e65

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibba9949167b69c3ecd535062508c7f7e3a2d366d