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

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

Change-Id: I2f8922d217cbd566e419cb978b25d0e8925df738