Merge IMS changes from klp-wireless-dev to master

Change-Id: I247fa2b0e3aa159a27d96951edb0b04afd4d5ec6
diff --git a/res/values/config.xml b/res/values/config.xml
index 2664bc7..5dea4dd 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -143,4 +143,7 @@
          TODO: This is GSM specific. Need to define a generic "use the builtin SIMs" Connection
          Service and use it as the default. -->
     <string name="connection_service_default" translatable="false">com.android.phone/com.android.services.telephony.PstnConnectionService</string>
+
+    <!-- Does not display additional call seting for IMS phone based on GSM Phone -->
+    <bool name="config_additional_call_setting">true</bool>
 </resources>