Merge cherrypicks of [4318204] into ub-testdpc-pic-release

Change-Id: I9e363abe186d3bbdd99f3537ad97398be74babf9

Author: android-build-team Robot

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

@@ -70,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_add_account);
         GlifLayout layout = findViewById(R.id.setup_wizard_layout);
-        layout.findViewById(R.id.next_button).setOnClickListener(this::onNavigateNext);
+        layout.findViewById(R.id.suw_navbar_next).setOnClickListener(this::onNavigateNext);
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {

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

@@ -48,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         setContentView(R.layout.finalize_activity);
         mSetupWizardLayout = findViewById(R.id.setup_wizard_layout);
-        mFinishButton = mSetupWizardLayout.findViewById(R.id.next_button);
+        mFinishButton = mSetupWizardLayout.findViewById(R.id.suw_navbar_next);
         mFinishButton.setText(R.string.finish_button);
         mFinishButton.setOnClickListener(this::onNavigateNext);
 

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

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