Import updated Android SetupCompat Library 241465949

Copied from google3/third_party/java_src/android_libs/setupcompat

Test: mm

Included changes:
  - 241465949 Fix lint error for setupcompat library.
  - 241273207 Add null checking for isAnySetupWizard

PiperOrigin-RevId: 241465949
Change-Id: I21857f3cd7733ede34ab37cec7293c6b35e9d903

1 files changed, 9 insertions, 5 deletions

diff --git a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
index d071dbf..61cd760 100644
--- a/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
+++ b/main/java/com/google/android/setupcompat/util/WizardManagerHelper.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.provider.Settings;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import com.google.android.setupcompat.internal.BuildCompat;
 import java.util.Arrays;
@@ -196,14 +197,17 @@ public class WizardManagerHelper {
    * @param originalIntent The original intent that was used to start the step, usually via {@link
    *     Activity#getIntent()}.
    */
-  public static boolean isAnySetupWizard(Intent originalIntent) {
+  public static boolean isAnySetupWizard(@Nullable Intent originalIntent) {
+    if (originalIntent == null) {
+      return false;
+    }
+
     if (BuildCompat.isAtLeastQ()) {
       return originalIntent.getBooleanExtra(EXTRA_IS_SETUP_FLOW, false);
     } else {
-      return originalIntent != null
-          && (isSetupWizardIntent(originalIntent)
-              || isPreDeferredSetupWizard(originalIntent)
-              || isDeferredSetupWizard(originalIntent));
+      return isSetupWizardIntent(originalIntent)
+          || isPreDeferredSetupWizard(originalIntent)
+          || isDeferredSetupWizard(originalIntent);
     }
   }
 }