[Payment Request] Keep selection for edited item when canceling editors

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java
index a8ecda78d5d419c8a0f2725082bc8f0a41b59b80..249491ca600428ef44a8dcd0c03eef57a8fd8c46 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestSection.java
@@ -893,6 +893,11 @@ public abstract class PaymentRequestSection extends LinearLayout implements View
                 }
             }
 
+            /** Returns whether this OptionRow's RadioButton is checked. */
+            public boolean isChecked() {
+                return ((RadioButton) mButton).isChecked();
+            }
+
             /** Change the label for the row. */
             public void setLabel(int stringId) {
                 setLabel(getContext().getString(stringId));
@@ -1056,6 +1061,7 @@ public abstract class PaymentRequestSection extends LinearLayout implements View
             private View createEditIcon(GridLayout parent, int rowIndex) {
                 View editorIcon = LayoutInflater.from(parent.getContext())
                                           .inflate(R.layout.payment_option_edit_icon, null);
+                editorIcon.setId(R.id.payments_open_editor_pencil_button);
 
                 // The icon floats to the right of everything.
                 GridLayout.LayoutParams iconParams = new GridLayout.LayoutParams(