Only auto select group writable accounts for new labels

Test: manually create new labels with 0, 1, and 2 group writable
  accounts

Bug: 31408843
Change-Id: I550885373734c0398d81ddb109e37dbd74a52259
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 01228e3..09281ee 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -441,7 +441,7 @@
         final Account account = extras == null ? null :
                 (Account) extras.getParcelable(Intents.Insert.EXTRA_ACCOUNT);
         if (account == null) {
-            selectAccount();
+            selectAccountForNewGroup();
         } else {
             final String dataSet = extras == null
                     ? null : extras.getString(Intents.Insert.EXTRA_DATA_SET);
@@ -625,9 +625,9 @@
         }
     }
 
-    private void selectAccount() {
+    private void selectAccountForNewGroup() {
         final List<AccountWithDataSet> accounts = AccountTypeManager.getInstance(this)
-                .getAccounts(/* writable */ true);
+                .getGroupWritableAccounts();
         if (accounts.isEmpty()) {
             // We shouldn't present the add group button if there are no writable accounts
             // but check it since it's possible we are started with an Intent.