[Merge M57] Use uniform margin for icon, label and sublabel

components/autofill/core/browser/autofill_experiments.cc

Index: components/autofill/core/browser/autofill_experiments.cc
diff --git a/components/autofill/core/browser/autofill_experiments.cc b/components/autofill/core/browser/autofill_experiments.cc
index 92dfff2ec07feb518449375af08dfc7179a5b4cc..17ac3442f73607b40d663f7e04156f3f66708754 100644
--- a/components/autofill/core/browser/autofill_experiments.cc
+++ b/components/autofill/core/browser/autofill_experiments.cc
@@ -146,6 +146,10 @@ void ModifyAutofillCreditCardSuggestion(Suggestion* suggestion) {
   }
 }
 
+unsigned int GetPopupMargin() {
+  return GetCreditCardPopupParameterUintValue(kAutofillPopupMarginKey);
+}
+
 bool OfferStoreUnmaskedCards() {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // The checkbox can be forced on with a flag, but by default we don't store