griffin: Remove config_sms_force_7bit_encoding

* Breaks receiving emojis from SMS

Change-Id: Ifc9d0dbd81f7ec93839893635214b0e3a92c1503

49 files changed, 0 insertions, 1088 deletions

diff --git a/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc07/config.xml b/overlay/frameworks/base/core/res/res/values-mcc262-mnc07/config.xml
index ab5322e8..e0f7b60c 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc262-mnc07/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc262-mnc07/config.xml
@@ -20,7 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
     <string-array translatable="false" name="config_default_vm_number">
         <item>+491793000333</item>
     </string-array>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc262-mnc08/config.xml b/overlay/frameworks/base/core/res/res/values-mcc262-mnc08/config.xml
index ab5322e8..e0f7b60c 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc262-mnc08/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc262-mnc08/config.xml
@@ -20,7 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
     <string-array translatable="false" name="config_default_vm_number">
         <item>+491793000333</item>
     </string-array>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc268-mnc01/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc330-mnc110/config.xml b/overlay/frameworks/base/core/res/res/values-mcc330-mnc110/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc330-mnc110/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc334-mnc020/config.xml b/overlay/frameworks/base/core/res/res/values-mcc334-mnc020/config.xml
deleted file mode 100644
index 7e42887c..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc334-mnc020/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc334-mnc050/config.xml b/overlay/frameworks/base/core/res/res/values-mcc334-mnc050/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc334-mnc050/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc334-mnc090/config.xml b/overlay/frameworks/base/core/res/res/values-mcc334-mnc090/config.xml
index 42a85c8b..f511f868 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc334-mnc090/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc334-mnc090/config.xml
@@ -20,8 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-
     <!-- String containing the apn value for tethering.  May be overriden by secure settings
          TETHER_DUN_APN.  Value is a comma separated series of strings:
          "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
diff --git a/overlay/frameworks/base/core/res/res/values-mcc334-mnc30/config.xml b/overlay/frameworks/base/core/res/res/values-mcc334-mnc30/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc334-mnc30/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc370-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc370-mnc02/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc370-mnc02/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc706-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc706-mnc01/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc706-mnc01/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc712-mnc03/config.xml b/overlay/frameworks/base/core/res/res/values-mcc712-mnc03/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc712-mnc03/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc714-mnc03/config.xml b/overlay/frameworks/base/core/res/res/values-mcc714-mnc03/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc714-mnc03/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc716-mnc06/config.xml b/overlay/frameworks/base/core/res/res/values-mcc716-mnc06/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc716-mnc06/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc716-mnc10/config.xml b/overlay/frameworks/base/core/res/res/values-mcc716-mnc10/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc716-mnc10/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc716-mnc17/config.xml b/overlay/frameworks/base/core/res/res/values-mcc716-mnc17/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc716-mnc17/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc02/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc02/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc07/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc07/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc07/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc310/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc310/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc310/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml
index 44decc0b..a09a8795 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml
@@ -20,8 +20,6 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-
     <!-- String containing the apn value for tethering.  May be overriden by secure settings
          TETHER_DUN_APN.  Value is a comma separated series of strings:
          "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc340/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc340/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc340/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc341/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc341/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc341/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc36/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc36/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc722-mnc36/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc02/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc02/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc03/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc03/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc03/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc04/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc04/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc04/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc05/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc05/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc05/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc06/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc06/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc06/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc10/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc10/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc10/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc11/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc11/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc11/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc16/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc16/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc16/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc23/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc23/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc23/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc24/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc24/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc24/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc31/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc31/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc31/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml b/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc724-mnc39/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc730-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc730-mnc01/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc730-mnc01/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc730-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc730-mnc02/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc730-mnc02/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc730-mnc09/config.xml b/overlay/frameworks/base/core/res/res/values-mcc730-mnc09/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc730-mnc09/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc730-mnc10/config.xml b/overlay/frameworks/base/core/res/res/values-mcc730-mnc10/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc730-mnc10/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc732-mnc101/config.xml b/overlay/frameworks/base/core/res/res/values-mcc732-mnc101/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc732-mnc101/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc732-mnc103/config.xml b/overlay/frameworks/base/core/res/res/values-mcc732-mnc103/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc732-mnc103/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc732-mnc111/config.xml b/overlay/frameworks/base/core/res/res/values-mcc732-mnc111/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc732-mnc111/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc732-mnc12/config.xml b/overlay/frameworks/base/core/res/res/values-mcc732-mnc12/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc732-mnc12/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc732-mnc123/config.xml b/overlay/frameworks/base/core/res/res/values-mcc732-mnc123/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc732-mnc123/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc732-mnc130/config.xml b/overlay/frameworks/base/core/res/res/values-mcc732-mnc130/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc732-mnc130/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc734-mnc04/config.xml b/overlay/frameworks/base/core/res/res/values-mcc734-mnc04/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc734-mnc04/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc740-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc740-mnc01/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc740-mnc01/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc744-mnc02/config.xml b/overlay/frameworks/base/core/res/res/values-mcc744-mnc02/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc744-mnc02/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc748-mnc10/config.xml b/overlay/frameworks/base/core/res/res/values-mcc748-mnc10/config.xml
deleted file mode 100644
index cf02018e..00000000
--- a/overlay/frameworks/base/core/res/res/values-mcc748-mnc10/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
-    <bool name="config_sms_force_7bit_encoding">true</bool>
-</resources>