Import updated Android SetupCompat Library 652748007

Copied from google3/third_party/java_src/android_libs/setupcompat

Test: mm

Included changes:
  - 652748007 Create WizardManagerExtras and WizardManagerBundle to ena...
  - 643865551 [SetupLibrary] Fix typo in FooterBarMixin.

PiperOrigin-RevId: 652748007
Change-Id: I65ed7d52733f0fb48e3e302ce21a9657a5639ec9
diff --git a/main/java/com/google/android/setupcompat/template/FooterBarMixin.java b/main/java/com/google/android/setupcompat/template/FooterBarMixin.java
index 84cba21..5939a18 100644
--- a/main/java/com/google/android/setupcompat/template/FooterBarMixin.java
+++ b/main/java/com/google/android/setupcompat/template/FooterBarMixin.java
@@ -265,11 +265,11 @@
   }
 
   private View addSpace() {
-    LinearLayout buttonContainerlayout = ensureFooterInflated();
+    LinearLayout buttonContainerLayout = ensureFooterInflated();
     View space = new View(context);
     space.setLayoutParams(new LayoutParams(0, 0, 1.0f));
     space.setVisibility(View.INVISIBLE);
-    buttonContainerlayout.addView(space);
+    buttonContainerLayout.addView(space);
     return space;
   }
 
diff --git a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
index 1378c06..9c73ea9 100644
--- a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
+++ b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
@@ -54,7 +54,7 @@
 
   @VisibleForTesting public static final String ACTION_NEXT = "com.android.wizard.NEXT";
 
-  @VisibleForTesting static final String EXTRA_WIZARD_BUNDLE = "wizardBundle";
+  public static final String EXTRA_WIZARD_BUNDLE = "wizardBundle";
   private static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
 
   /** Extra for notifying an Activity that it is inside the first SetupWizard flow or not. */
@@ -260,5 +260,7 @@
     }
   }
 
+  // (--
+
   private WizardManagerHelper() {}
 }