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

chrome/android/java/res/layout/payment_option_edit_icon.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 The Chromium Authors. All rights reserved.
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
-     
+
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/payments_open_editor_pencil_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/payments_edit_button">
 
     <View
             android:layout_width="1dp"
             android:layout_height="48dp"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/payments_section_large_spacing"
             android:layout_marginEnd="@dimen/payments_section_large_spacing"
             android:background="@color/payments_section_separator"
             android:importantForAccessibility="no"/>
 
     <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_gravity="center_vertical"
             android:src="@drawable/bookmark_edit_normal"
             android:contentDescription="@null"
             android:importantForAccessibility="no" />
-</LinearLayout>
+</LinearLayout>