Use server ID to identify server cards.

components/autofill/core/browser/personal_data_manager.cc

Index: components/autofill/core/browser/personal_data_manager.cc
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index 1a8614f8ceb7fba26a3ce64e0c8136d56e7ffdbf..5e6092c436c1d06a6e0f08e1b4af0b0443c2feb4 100644
--- a/components/autofill/core/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -631,7 +631,7 @@ void PersonalDataManager::UpdateServerCardBillingAddress(
 
   CreditCard* existing_credit_card = nullptr;
   for (auto* server_card : server_credit_cards_) {
-    if (credit_card.guid() == server_card->guid()) {
+    if (credit_card.server_id() == server_card->server_id()) {
       existing_credit_card = server_card;
       break;
     }