Pre-revamped UI cleanup grid option rename

Rename grid option to replace pre-revamped UI grid option.

Bug: 262780002
Test: manually verified
Change-Id: I5cc0dcb2fd38371a14b997422a1c233a9433aa75
diff --git a/res/layout/fragment_grid.xml b/res/layout/fragment_grid.xml
index 8c97d45..f022268 100644
--- a/res/layout/fragment_grid.xml
+++ b/res/layout/fragment_grid.xml
@@ -81,7 +81,7 @@
             It's critical for any TextViews inside the included layout to have text.
             -->
             <include
-                layout="@layout/grid_option_2"
+                layout="@layout/grid_option"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="invisible" />
diff --git a/res/layout/grid_option_2.xml b/res/layout/grid_option.xml
similarity index 100%
rename from res/layout/grid_option_2.xml
rename to res/layout/grid_option.xml
diff --git a/src/com/android/customization/model/grid/GridOption.java b/src/com/android/customization/model/grid/GridOption.java
index 10a5db6..347929c 100644
--- a/src/com/android/customization/model/grid/GridOption.java
+++ b/src/com/android/customization/model/grid/GridOption.java
@@ -115,7 +115,7 @@
 
     @Override
     public int getLayoutResId() {
-        return R.layout.grid_option_2;
+        return R.layout.grid_option;
     }
 
     @Override
diff --git a/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt b/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt
index a05a9c1..bcb3737 100644
--- a/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt
+++ b/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt
@@ -55,7 +55,7 @@
         optionView.addItemDecoration(ItemSpacing(ItemSpacing.ITEM_SPACING_DP))
         val adapter =
             OptionItemAdapter(
-                layoutResourceId = R.layout.grid_option_2,
+                layoutResourceId = R.layout.grid_option,
                 lifecycleOwner = lifecycleOwner,
                 backgroundDispatcher = backgroundDispatcher,
                 foregroundTintSpec =