[Signin][Android] Adjust AccountManagementFragment after removing sign-out pref

This CL adjusts the if branch in AccountManagementFragment after
removing sign-out allowed pref value.

Bug: 1162231
Change-Id: I463913e92c45de052c0272a478282fb3c2ad1932
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2624647Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842923}

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java

@@ -204,30 +204,27 @@ public class AccountManagementFragment extends PreferenceFragmentCompat
             }
             signOutPreference.setTitle(getSignOutPreferenceText());
             signOutPreference.setOnPreferenceClickListener(preference -> {
-                if (!isVisible() || !isResumed()) return false;
-
-                if (mSignedInAccountName != null) {
-                    SigninMetricsUtils.logProfileAccountManagementMenu(
-                            ProfileAccountManagementMetrics.TOGGLE_SIGNOUT, mGaiaServiceType);
-
-                    if (IdentityServicesProvider.get()
-                                    .getIdentityManager(Profile.getLastUsedRegularProfile())
-                                    .getPrimaryAccountInfo(ConsentLevel.SYNC)
-                            != null) {
-                        // Only show the sign-out dialog if the user has given sync consent.
-                        SignOutDialogFragment signOutFragment =
-                                SignOutDialogFragment.create(mGaiaServiceType);
-                        signOutFragment.setTargetFragment(AccountManagementFragment.this, 0);
-                        signOutFragment.show(getFragmentManager(), SIGN_OUT_DIALOG_TAG);
-                    } else {
-                        IdentityServicesProvider.get()
-                                .getSigninManager(Profile.getLastUsedRegularProfile())
-                                .signOut(SignoutReason.USER_CLICKED_SIGNOUT_SETTINGS, null, false);
-                    }
-                    return true;
+                if (!isVisible() || !isResumed() || mSignedInAccountName == null) {
+                    return false;
                 }
-
-                return false;
+                SigninMetricsUtils.logProfileAccountManagementMenu(
+                        ProfileAccountManagementMetrics.TOGGLE_SIGNOUT, mGaiaServiceType);
+
+                if (IdentityServicesProvider.get()
+                                .getIdentityManager(Profile.getLastUsedRegularProfile())
+                                .getPrimaryAccountInfo(ConsentLevel.SYNC)
+                        != null) {
+                    // Only show the sign-out dialog if the user has given sync consent.
+                    SignOutDialogFragment signOutFragment =
+                            SignOutDialogFragment.create(mGaiaServiceType);
+                    signOutFragment.setTargetFragment(AccountManagementFragment.this, 0);
+                    signOutFragment.show(getFragmentManager(), SIGN_OUT_DIALOG_TAG);
+                } else {
+                    IdentityServicesProvider.get()
+                            .getSigninManager(Profile.getLastUsedRegularProfile())
+                            .signOut(SignoutReason.USER_CLICKED_SIGNOUT_SETTINGS, null, false);
+                }
+                return true;
             });
         }
     }