[Merge M-53] Clear callback pointer after using it in AutofillPaymentInstrument.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
index 682acfee84d655cc4ab2befe179c2182d26ce4e1..aa705adb7d819b84f6e6053ba388ddfb3f41dd1c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java
@@ -106,7 +106,7 @@ public class AutofillPaymentInstrument
 
             json.endObject();
         } catch (IOException e) {
-            mCallback.onInstrumentDetailsError();
+            onFullCardError();
             return;
         }
 
@@ -120,6 +120,7 @@ public class AutofillPaymentInstrument
     @Override
     public void onFullCardError() {
         mCallback.onInstrumentDetailsError();
+        mCallback = null;
     }
 
     @Override