[Payments] Remove country from shipping label in bottom and fullsheet.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
index 5556cd458070f2f982c2d6b22b7c0e750a292f11..769fe59b060be6d287a141db36e78c643f7521be 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
@@ -43,6 +43,7 @@ import org.chromium.base.Callback;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.payments.ShippingStrings;
+import org.chromium.chrome.browser.payments.ui.PaymentOption.OptionSectionFocusChangedDelegate;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.ExtraTextsSection;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.LineItemBreakdownSection;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSection;
@@ -947,6 +948,16 @@ public class PaymentRequestUI implements DialogInterface.OnDismissListener, View
                 && !mIsClientCheckingSelection;
     }
 
+    /**
+     * Sets the delegate to be called when the shipping address section gains or loses focus.
+     *
+     * @param delegate The delegate to notify.
+     */
+    public void setShippingAddressSectionFocusChangedDelegate(
+            OptionSectionFocusChangedDelegate delegate) {
+        mShippingAddressSection.setOptionSectionFocusChangedDelegate(delegate);
+    }
+
     private void expand(PaymentRequestSection section) {
         if (!mIsShowingEditDialog) {
             // Container now takes the full height of the screen, animating towards it.