Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f am: 4744871cfc am: 43134aaaba am: 45f1218207

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

Change-Id: I333f4a4b32cbd584f38897ebe4082076c44eb6ba