[Merge-58] Save billing address changes for server cards on android.

chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java
index 5fb89fb5ca0d76966ae6e3acba75e039c6ba558a..dd6918f10249d3f981245161779a012f8e19b46b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java
@@ -14,6 +14,7 @@ import android.widget.TextView;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
+import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 
 /**
@@ -90,7 +91,12 @@ public class AutofillServerCardEditor extends AutofillCreditCardEditor {
 
     @Override
     protected boolean saveEntry() {
-        PersonalDataManager.getInstance().updateServerCardBillingAddress(mCard);
+        if (mBillingAddress.getSelectedItem() != null
+                && mBillingAddress.getSelectedItem() instanceof AutofillProfile) {
+            mCard.setBillingAddressId(
+                    ((AutofillProfile) mBillingAddress.getSelectedItem()).getGUID());
+            PersonalDataManager.getInstance().updateServerCardBillingAddress(mCard);
+        }
         return true;
     }