resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE)

The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff

diff --cc core/res/res/values/config.xml
Simple merge

diff --cc core/res/res/values/symbols.xml
index 7edefae,2dcbefe..1cd1d96
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -2087,7 -2072,5 +2087,7 @@@
    <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />
    <java-symbol type="string" name="whichHomeApplicationNamed" />
    <java-symbol type="bool" name="config_sms_force_7bit_encoding" />
- 
 +  <!-- From MSIM Account -->
 +  <java-symbol type="layout" name="simple_account_item" />
+   <java-symbol type="array" name="config_sms_convert_destination_number_support" />
  </resources>