[Payments] Use default country code if country code is not available in profile

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
index df376273c960b848be28bb620aacca3b31d2897e..4fc0ae9c74a86d77f876bef5582a8b69a0faa623 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java
@@ -152,7 +152,8 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
         // For example, "US" will not add dependent locality to the editor. A "JP" address will
         // start with a person's full name or a with a prefecture name, depending on whether the
         // language code is "ja-Latn" or "ja".
-        addAddressTextFieldsToEditor(editor, profile.getCountryCode(), profile.getLanguageCode());
+        addAddressTextFieldsToEditor(
+                editor, mCountryField.getValue().toString(), profile.getLanguageCode());
 
         // Phone number is present and required for all countries.
         if (mPhoneField == null) {