Merge "fix wrong substring"

Author: Dianne Hackborn

core/java/android/provider/ContactsContract.java

@@ -8362,7 +8362,7 @@ public static String snippetize(String content, String displayName, String query
                 // Line contains the query string - now search for it at the start of tokens.
                 List<String> lineTokens = new ArrayList<String>();
                 List<Integer> tokenOffsets = new ArrayList<Integer>();
-                split(contentLine.trim(), lineTokens, tokenOffsets);
+                split(contentLine, lineTokens, tokenOffsets);
 
                 // As we find matches against the query, we'll populate this list with the marked
                 // (or unchanged) tokens.