Revert "Disable grid option feature in ThemePicker"

This reverts commit 0c8823896677f91e16b5fcbd374a3d2ca3e801d3.

Reason for revert: Disable grid in rvc-dev, and revert this change in rvc-d1-dev.

Bug: 158790001

Change-Id: Id19579b87d0a83424be794cbac95b7df3fd67131
1 file changed