[Contacts] Group contacts api runtime featues together

This will make it easier to start an origin trial with all of the new
features together.

Change-Id: If983c733251bcab34ff7e32189d250fb6b6a3538
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1919347
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716007}

third_party/blink/renderer/modules/contacts_picker/contact_address.idl

@@ -7,5 +7,5 @@
 [
     SecureContext,
     Exposed=Window,
-    RuntimeEnabled=ContactsManagerAddresses
+    RuntimeEnabled=ContactsManagerExtraProperties
 ] interface ContactAddress : PaymentAddress {};

third_party/blink/renderer/modules/contacts_picker/contacts_manager.cc

@@ -102,10 +102,10 @@ constexpr char kIcon[] = "icon";
 ContactsManager::ContactsManager() {
   properties_ = {kEmail, kName, kTel};
 
-  if (RuntimeEnabledFeatures::ContactsManagerAddressesEnabled())
+  if (RuntimeEnabledFeatures::ContactsManagerExtraPropertiesEnabled()) {
     properties_.push_back(kAddress);
-  if (RuntimeEnabledFeatures::ContactsManagerIconsEnabled())
     properties_.push_back(kIcon);
+  }
 }
 
 ContactsManager::~ContactsManager() = default;

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -337,11 +337,7 @@
       status: {"Android": "experimental", "default": "test"},
     },
     {
-      name: "ContactsManagerAddresses",
-      status: {"Android": "experimental", "default": "test"},
-    },
-    {
-      name: "ContactsManagerIcons",
+      name: "ContactsManagerExtraProperties",
       status: {"Android": "experimental", "default": "test"},
     },
     {