Temporary disable WiFi Calling

Bug: 19937292
Change-Id: I796018c563bd51956f97422aca54ece0d59a6ade
diff --git a/init.shamu.rc b/init.shamu.rc
index a59fda2..6bebb32 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -602,6 +602,7 @@
     user system
     group system radio
 
-service cnd /system/bin/cnd
-    class late_start
-    socket cnd stream 660 root inet
+# STOPSHIP: Required for WiFi Calling
+#service cnd /system/bin/cnd
+#    class late_start
+#    socket cnd stream 660 root inet
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index a3232c8..22f9ad1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -274,7 +274,8 @@
     <bool name="config_device_volte_available">true</bool>
 
     <!-- Flag specifying whether WFC over IMS is availasble on device -->
-    <bool name="config_device_wfc_ims_available">true</bool>
+    <!-- STOPSHIP if disabled -->
+    <bool name="config_device_wfc_ims_available">false</bool>
 
     <!-- Configure mobile tcp buffer sizes in the form:
          rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max