[WebLayer] Move disconnectIfNoPaymentMethodsSupported

Motivation:
This CL lays the preparatory work to create onShowCalledAndAppQueried()
which will encapsulate the following methods:
- disconnectIfNoPaymentMethodsSupported
- showAppSelector
- triggerPaymentAppUiSkipIfApplicable

Behavioural changes:
Note that disconnectIfNoPaymentMethodsSupported() depends on
mHasEnrolledInstrument, so this moving will add prefsCanMakePayment
to the disconnection conditions. The new behaviour should be a
correct one because mHasEnrolledInstrument is finalized only after
prefsCanMakePayment. Before the CL,
disconnectIfNoPaymentMethodsSupported tests different
mHasEnrolledInstrument when it's invoked in different places.

Bug: 1153353
Change-Id: I6752d33d5c4d2bbbb6ce237248dc4692584ef1e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2562836
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832185}

components/payments/content/android/java/src/org/chromium/components/payments/PaymentRequestService.java

@@ -743,18 +743,10 @@ public class PaymentRequestService
 
         mIsFinishedQueryingPaymentApps = true;
 
-        if (mIsShowCalled && disconnectIfNoPaymentMethodsSupported()) return;
-
         // Always return false when can make payment is disabled.
         mHasEnrolledInstrument &= mDelegate.prefsCanMakePayment();
 
-        if (mIsCanMakePaymentResponsePending) {
-            respondCanMakePaymentQuery();
-        }
-
-        if (mIsHasEnrolledInstrumentResponsePending) {
-            respondHasEnrolledInstrumentQuery();
-        }
+        if (mIsShowCalled && disconnectIfNoPaymentMethodsSupported()) return;
 
         mBrowserPaymentRequest.notifyPaymentUiOfPendingApps(mPendingApps);
         mPendingApps.clear();
@@ -772,6 +764,14 @@ public class PaymentRequestService
             onShowFailed(error);
             return;
         }
+
+        if (mIsCanMakePaymentResponsePending) {
+            respondCanMakePaymentQuery();
+        }
+
+        if (mIsHasEnrolledInstrumentResponsePending) {
+            respondHasEnrolledInstrumentQuery();
+        }
     }
 
     private void onShowFailed(String error) {