Fix potential afwtest.suwdoprovisioning.SuwDoProvisioningTest.testDoProvisioning breakage.

Bump version code to 5.0.4.


Bug: 110048924
Test: manual
Change-Id: I91e9d94550ba2ddff48c0e221de2274c8e12f47a
(cherry picked from commit 8cfe1b89f344fb8e16f69ab9c897d0785454c42a)

Author: yuemingw

app/build.gradle

@@ -9,7 +9,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 03
+    versionBuild = 04
 }
 
 android {

app/src/main/java/com/afwsamples/testdpc/SetupManagementFragment.java

@@ -110,7 +110,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.setup_management_fragment, container, false);
         GlifLayout layout = view.findViewById(R.id.setup_wizard_layout);
 
-        mNavigationNextButton = layout.findViewById(R.id.setup_button);
+        mNavigationNextButton = layout.findViewById(R.id.suw_navbar_next);
         mNavigationNextButton.setOnClickListener(this::onNavigateNext);
         layout.findViewById(R.id.exit_button).setOnClickListener(this::onNavigateBack);
 

app/src/main/res/layout/setup_footer.xml

@@ -35,7 +35,7 @@
         android:layout_weight="1" />
 
     <Button
-        android:id="@+id/setup_button"
+        android:id="@+id/suw_navbar_next"
         style="@style/SuwGlifButton.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"