am 403d7ac7: Bring back SHOULD_SYNC flag so sync groups can be edited.

Merge commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90'

* commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90':
  Bring back SHOULD_SYNC flag so sync groups can be edited.

core/java/android/provider/ContactsContract.java

@@ -1360,6 +1360,14 @@ public final class ContactsContract {
          * <P>Type: INTEGER</P>
          */
         public static final String DELETED = "deleted";
+
+        /**
+         * Whether this group should be synced if the SYNC_EVERYTHING settings
+         * is false for this group's account.
+         * <p>
+         * Type: INTEGER (boolean)
+         */
+        public static final String SHOULD_SYNC = "should_sync";
     }
 
     /**