Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f am: 15816e2cb3 am: 22395f0f02 am: 37bdb08a45

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

Change-Id: I9b91f1c0835daa9068cf3059b891f78e43d45269