Integrate MMTel API into the framework

1) Futher integration of the ImsSerice
Test App for verification.

2) Changes some classes to integrate with the
new ImsService API.

3) Adds enable/DisableIms API and some more
misc. piping into telephony from
TelephonyManager.

Bug: 63987047
Test: Run ImsService Test App
Merged-In: Id34823fcaa9975968e2fd223f53f756a46da24bd
Change-Id: Id34823fcaa9975968e2fd223f53f756a46da24bd
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index a3b0892..5a228a8 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -349,7 +349,7 @@
         }
 
         try {
-            if (mImsMgr.getImsServiceStatus() != ImsFeature.STATE_READY) {
+            if (mImsMgr.getImsServiceState() != ImsFeature.STATE_READY) {
                 log("Feature state not ready so remove vt and wfc settings for "
                         + " phone =" + mPhone.getPhoneId());
                 prefSet.removePreference(wifiCallingSettings);