FP2-1516: Use simple queries for phone lookups

FP2-1516: [ST_2][Messaging]"Unfortunately, Messaging has stopped."
pops up when tapping receiver name

Use simple queries for phone lookups to avoid hitting ContactsProvider
permissions bug.

Change-Id: I02a8bf373a97cc6cecca5dcce569a9ba17aafaa3
diff --git a/src/com/android/ex/chips/RecipientAlternatesAdapter.java b/src/com/android/ex/chips/RecipientAlternatesAdapter.java
index 6569d36..35ff2a7 100644
--- a/src/com/android/ex/chips/RecipientAlternatesAdapter.java
+++ b/src/com/android/ex/chips/RecipientAlternatesAdapter.java
@@ -411,7 +411,7 @@
             selection.append(Queries.PHONE.getProjection()[Queries.Query.CONTACT_ID]);
             selection.append(" = ?");
 
-            if (lookupKey == null) {
+            if (directoryId == null || lookupKey == null) {
                 uri = Queries.PHONE.getContentUri();
                 desiredMimeType = null;
             } else {