Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev am: 79e81dd799 am: 4853401c1c

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

Change-Id: Icb1b06adb01ccd051186f1f416f31c28865f3878