Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev

        <provider

            android:name="com.android.launcher3.graphics.GridOptionsProvider"

            android:authorities="${packageName}.grid_control"

            android:exported="true"

            android:enabled="false" />

            android:exported="true" />

        <!--

        The settings activity. To extend point settings_fragment_name to appropriate fragment class