Merge "Fix NPE"

am: 78658058dc

Change-Id: Iab42549310f6fdc6154c57a77721073a414215a2

telephony/java/android/telephony/PhoneNumberUtils.java

@@ -217,6 +217,9 @@ public class PhoneNumberUtils {
         }
 
         String scheme = uri.getScheme();
+        if (scheme == null) {
+            return null;
+        }
 
         if (scheme.equals("tel") || scheme.equals("sip")) {
             return uri.getSchemeSpecificPart();