Rollback telephony-resources

Bug: 149776042
Test: TeleServiceTests
Change-Id: I7fcb2af4a63227ba834a3c1aedced9aa9ef30245
Merged-In: I7fcb2af4a63227ba834a3c1aedced9aa9ef30245
(cherry picked from commit a269cee5372ce25a7c1688b66fe5668de178a60a)
diff --git a/device-redfin.mk b/device-redfin.mk
index f5c3388..a47643d 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -34,9 +34,6 @@
 
 DEVICE_PACKAGE_OVERLAYS += device/google/redfin/redfin/overlay
 
-PRODUCT_PACKAGES += \
-    TelephonyOverlay2020Redfin
-
 # Audio XMLs for redfin
 ifeq ($(wildcard vendor/google_fih/redfin/factory/prebuilt/ftm.mk),)
 PRODUCT_COPY_FILES += \
diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp
deleted file mode 100644
index 74a0651..0000000
--- a/rro_overlays/TelephonyOverlay/Android.bp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Copyright (C) 2020 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.
-//
-
-runtime_resource_overlay {
-    name: "TelephonyOverlay2020Redfin",
-    resource_dirs: ["res"],
-    certificate: "platform",
-    product_specific: true,
-    aaptflags: ["--auto-add-overlay"],
-    manifest: "AndroidManifest.xml",
-    theme: "TelephonyOverlay2020Redfin",
-}
-
diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml
deleted file mode 100644
index e3662bc..0000000
--- a/rro_overlays/TelephonyOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<!-- Pixel specific wifi overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.telephony.resources.pixel"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.telephony.resources"
-      android:targetName="TelephonyCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
-
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc204-mnc04/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc204-mnc04/donottranslate_config.xml
deleted file mode 100644
index 4eef2d0..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc204-mnc04/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +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>
-
-    <!-- Use ERI text for network name on CDMA LTE -->
-    <bool name="config_LTE_eri_for_network_name">false</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc004/donottranslate_config.xml
deleted file mode 100644
index 4eef2d0..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc004/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +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>
-
-    <!-- Use ERI text for network name on CDMA LTE -->
-    <bool name="config_LTE_eri_for_network_name">false</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc120/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc120/donottranslate_config.xml
deleted file mode 100644
index b940d41..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc120/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +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>
-
-    <!-- Sometimes, PDU has garbages. So, need to use valid index -->
-    <integer name="config_valid_wappush_index">4</integer>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc260/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc260/donottranslate_config.xml
deleted file mode 100644
index 4cb6c79..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc260/donottranslate_config.xml
+++ /dev/null
@@ -1,40 +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>
-    <!-- Configure mobile tcp buffer sizes in the form:
-         rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
-         If no value is found for the rat-name in use, the system default will be applied.
-    -->
-    <string-array name="config_mobile_tcp_buffers">
-        <item>umts:21135,131070,1056768,6144,24576,165312</item>
-        <item>hspa:18300,131070,1056768,6144,24576,393216</item>
-        <item>hsdpa:18300,131070,1056768,6144,24576,393216</item>
-        <item>hsupa:6141,131070,1056768,6144,24576,393216</item>
-        <item>hspap:31455,131070,1830912,6144,24576,1830912</item>
-        <item>edge:8192,26280,704512,4096,16384,110208</item>
-        <item>gprs:8192,8760,704512,4096,8760,110208</item>
-        <item>lte:2097152,4194304,8388608,262144,524288,1048576</item>
-    </string-array>
-
-
-</resources>
-
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc410/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc410/donottranslate_config.xml
deleted file mode 100644
index 65a7fc1..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc310-mnc410/donottranslate_config.xml
+++ /dev/null
@@ -1,39 +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>
-    <!-- Configure mobile tcp buffer sizes in the form:
-         rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
-         If no value is found for the rat-name in use, the system default will be applied.
-    -->
-    <string-array name="config_mobile_tcp_buffers">
-        <item>umts:131072,262144,1452032,4096,16384,399360</item>
-        <item>hspa:131072,262144,1452032,4096,16384,399360</item>
-        <item>hsdpa:131072,262144,1452032,4096,16384,399360</item>
-        <item>hsupa:131072,262144,1452032,4096,16384,399360</item>
-        <item>hspap:131072,262144,1452032,4096,16384,399360</item>
-        <item>edge:4093,26280,35040,4096,16384,35040</item>
-        <item>gprs:4092,8760,11680,4096,8760,11680</item>
-        <item>evdo:4094,87380,262144,4096,16384,262144</item>
-        <item>lte:524288,1048576,8388608,262144,524288,4194304</item>
-    </string-array>
-
-</resources>
\ No newline at end of file
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc311-mnc480/donottranslate_config.xml
deleted file mode 100644
index 4eef2d0..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc311-mnc480/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +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>
-
-    <!-- Use ERI text for network name on CDMA LTE -->
-    <bool name="config_LTE_eri_for_network_name">false</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc312-mnc530/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc312-mnc530/donottranslate_config.xml
deleted file mode 100644
index b940d41..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc312-mnc530/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +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>
-
-    <!-- Sometimes, PDU has garbages. So, need to use valid index -->
-    <integer name="config_valid_wappush_index">4</integer>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc01/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc01/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc01/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc02/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc02/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc02/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc03/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc03/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc03/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc07/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc07/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc07/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc11/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc11/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc11/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc71/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc71/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc71/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc72/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc72/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc72/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc90/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc90/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/res/values-mcc505-mnc90/donottranslate_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_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/res/values/donottranslate_arrays.xml b/rro_overlays/TelephonyOverlay/res/values/donottranslate_arrays.xml
deleted file mode 100644
index 41dc40a..0000000
--- a/rro_overlays/TelephonyOverlay/res/values/donottranslate_arrays.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-
-<resources>
-    <!-- Device-specific array of SIM slot indexes which are are embedded eUICCs.
-         e.g. If a device has two physical slots with indexes 0, 1, and slot 1 is an
-         eUICC, then the value of this array should be:
-             <integer-array name="non_removable_euicc_slots">
-                 <item>1</item>
-             </integer-array>
-         If a device has three physical slots and slot 1 and 2 are eUICCs, then the value of
-         this array should be:
-             <integer-array name="non_removable_euicc_slots">
-                <item>1</item>
-                <item>2</item>
-             </integer-array>
-         This is used to differentiate between removable eUICCs and built in eUICCs, and should
-         be set by OEMs for devices which use eUICCs. -->
-    <integer-array name="non_removable_euicc_slots">
-        <item>1</item>
-    </integer-array>
-</resources>