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

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

Change-Id: I6940533ed3d481c91133870923b6de406fd5ba2b