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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94ef838f8fb75407a606bc35c78945c28ae38c8b