Change name of device account detection flag (1/2)

Test: see I1b9a0cbcd47c9a0a4e2299a692c7b7145ffeeec2
Bug: 32604475
Bug: 35246161

Change-Id: I24b1e5fa69172fbb3ce66e0946aca7cb6843e3fb
diff --git a/src/com/android/contacts/Experiments.java b/src/com/android/contacts/Experiments.java
index b6a9ae7..b53ced3 100644
--- a/src/com/android/contacts/Experiments.java
+++ b/src/com/android/contacts/Experiments.java
@@ -19,6 +19,13 @@
  * Experiment flag names.
  */
 public final class Experiments {
+
+    /**
+     * Experiment to enable device account detection using CP2 queries
+     */
+    public static final String CP2_DEVICE_ACCOUNT_DETECTION_ENABLED =
+            "Account__cp2_device_account_detection_enabled";
+
     /**
      * Flags for maximum content update time
      */
@@ -32,12 +39,6 @@
             "Shortcuts__dynamic_min_content_change_update_delay_millis";
 
     /**
-     * Experiment to enable device account detection using CP2 queries
-     */
-    public static final String OEM_CP2_DEVICE_ACCOUNT_DETECTION_ENABLED =
-            "OEM__cp2_device_account_detection_enabled";
-
-    /**
      * Flags for maximum time to show spinner for a contacts sync.
      */
     public static final String PULL_TO_REFRESH_CANCEL_REFRESH_MILLIS =