Backport Telephony.Threads to enable SMS interaction (1/2)

Also refactored private methods in PhoneNumberUtilsCompat.

Bug: 25629359

Change-Id: I9ac27050e35860ab2b35cc02faad23a88191457e
diff --git a/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java b/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
index abf7257..3cdb127 100644
--- a/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
+++ b/src/com/android/contacts/common/compat/PhoneNumberUtilsCompat.java
@@ -42,7 +42,7 @@
                 >= Build.VERSION_CODES.M) {
             return PhoneNumberUtils.createTtsSpannable(phoneNumber);
         } else {
-            return createTtsSpannablePrivate(phoneNumber);
+            return createTtsSpannableInternal(phoneNumber);
         }
     }
 
@@ -51,14 +51,14 @@
                 >= Build.VERSION_CODES.M) {
             return PhoneNumberUtils.createTtsSpan(phoneNumber);
         } else {
-            return createTtsSpanPrivate(phoneNumber);
+            return createTtsSpanInternal(phoneNumber);
         }
     }
 
     /**
      * Copied from {@link PhoneNumberUtils#createTtsSpannable}
      */
-    private static CharSequence createTtsSpannablePrivate(CharSequence phoneNumber) {
+    private static CharSequence createTtsSpannableInternal(CharSequence phoneNumber) {
         if (phoneNumber == null) {
             return null;
         }
@@ -85,7 +85,7 @@
     /**
      * Copied from {@link PhoneNumberUtils#createTtsSpan}
      */
-    private static TtsSpan createTtsSpanPrivate(String phoneNumberString) {
+    private static TtsSpan createTtsSpanInternal(String phoneNumberString) {
         if (phoneNumberString == null) {
             return null;
         }