Merge cherrypicks of ['googleplex-android-review.googlesource.com/33899631'] into security-aosp-udc-release.

Change-Id: I173edef642fb24d32e898aa7ce118bd15a8154c2

src/com/android/contacts/vcard/SelectAccountActivity.java

diff --git a/src/com/android/contacts/vcard/SelectAccountActivity.java b/src/com/android/contacts/vcard/SelectAccountActivity.java
index 8ead5fa..797fc86 100644
--- a/src/com/android/contacts/vcard/SelectAccountActivity.java
+++ b/src/com/android/contacts/vcard/SelectAccountActivity.java
@@ -65,15 +65,6 @@
             Log.w(LOG_TAG, "Account does not exist");
             finish();
             return;
-        } else if (accountList.size() == 1) {
-            final AccountWithDataSet account = accountList.get(0);
-            final Intent intent = new Intent();
-            intent.putExtra(ACCOUNT_NAME, account.name);
-            intent.putExtra(ACCOUNT_TYPE, account.type);
-            intent.putExtra(DATA_SET, account.dataSet);
-            setResult(RESULT_OK, intent);
-            finish();
-            return;
         }
 
         Log.i(LOG_TAG, "The number of available accounts: " + accountList.size());