Fix missing grid for devices that upgrade from R am: a62e49b365 am: 3977aa6014 am: 3159909d12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec32016369a60cbd5b40ddb7f303012f9f2c4388