Moved telephony overlays for Bonito and Sargo

Moved vendor overlays for Bonito and Sargo to device
to support backwards compatability.

Bug: 148390250
Test: Built bonito
Test: Built sargo
Change-Id: Id0aa18ca6cd63d1e28bb6d29141339c7d47e8c3c
diff --git a/device-bonito.mk b/device-bonito.mk
index f5a1f94..f666c80 100644
--- a/device-bonito.mk
+++ b/device-bonito.mk
@@ -23,6 +23,9 @@
 PRODUCT_COPY_FILES += \
     device/google/bonito/nfc/libnfc-nxp.bonito.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
 
+PRODUCT_PACKAGES += \
+    TelephonyOverlay2018MidyearBonito
+
 # Vibrator HAL
 PRODUCT_PRODUCT_PROPERTIES +=\
     ro.vibrator.hal.config.dynamic=1 \
diff --git a/device-sargo.mk b/device-sargo.mk
index 5e1c8c4..bca4811 100644
--- a/device-sargo.mk
+++ b/device-sargo.mk
@@ -20,6 +20,9 @@
 
 DEVICE_PACKAGE_OVERLAYS += device/google/bonito/sargo/overlay
 
+PRODUCT_PACKAGES += \
+    TelephonyOverlay2018MidyearSargo
+
 PRODUCT_COPY_FILES += \
     device/google/bonito/nfc/libnfc-nxp.sargo.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
 
diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp
new file mode 100644
index 0000000..72abbfa
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Android.bp
@@ -0,0 +1,37 @@
+//
+// 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: "TelephonyOverlay2018MidyearBonito",
+    resource_dirs: ["Bonito/res","Common/res"],
+    certificate: "platform",
+    product_specific: true,
+    aaptflags: ["--auto-add-overlay"],
+    manifest: "AndroidManifest.xml",
+    theme: "TelephonyOverlay2018MidyearBonito",
+}
+
+
+runtime_resource_overlay {
+    name: "TelephonyOverlay2018MidyearSargo",
+    resource_dirs: ["Sargo/res","Common/res"],
+    certificate: "platform",
+    product_specific: true,
+    aaptflags: ["--auto-add-overlay"],
+    manifest: "AndroidManifest.xml",
+    theme: "TelephonyOverlay2018MidyearSargo",
+}
+
diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..e3662bc
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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/Bonito/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc310-mnc004/donottranslate_config.xml
new file mode 100644
index 0000000..1cdb9c9
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc310-mnc004/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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>
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020a</string>
+    <!-- MMS user agent prolfile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g020a/g020a.xml</string>
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc311-mnc230/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc311-mnc230/donottranslate_config.xml
new file mode 100644
index 0000000..6edf16c
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc311-mnc230/donottranslate_config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, 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>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020c</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://pix.cspire.com/UA/profile/google/g020c/g020c.xml</string>
+
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc311-mnc480/donottranslate_config.xml
new file mode 100644
index 0000000..949b85d
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Bonito/res/values-mcc311-mnc480/donottranslate_config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, 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>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020a</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g020a/g020a.xml</string>
+
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Bonito/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Bonito/res/values/donottranslate_config.xml
new file mode 100644
index 0000000..2457827
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Bonito/res/values/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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>
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020c</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G020C.xml</string>
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc204-mnc04/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc204-mnc04/donottranslate_config.xml
new file mode 100644
index 0000000..4eef2d0
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc204-mnc04/donottranslate_config.xml
@@ -0,0 +1,27 @@
+<?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/Common/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc004/donottranslate_config.xml
new file mode 100644
index 0000000..4eef2d0
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc004/donottranslate_config.xml
@@ -0,0 +1,27 @@
+<?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/Common/res/values-mcc310-mnc120/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml
new file mode 100644
index 0000000..b16c85d
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml
@@ -0,0 +1,32 @@
+<?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>
+
+    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
+    <string-array translatable="false" name="config_twoDigitNumberPattern">
+        <item>"*2"</item>
+    </string-array>
+
+    <!-- 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/Common/res/values-mcc310-mnc260/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc260/donottranslate_config.xml
new file mode 100644
index 0000000..4cb6c79
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc260/donottranslate_config.xml
@@ -0,0 +1,40 @@
+<?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/Common/res/values-mcc310-mnc410/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc410/donottranslate_config.xml
new file mode 100644
index 0000000..4d0762e
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc410/donottranslate_config.xml
@@ -0,0 +1,39 @@
+<?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>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc311-mnc480/donottranslate_config.xml
new file mode 100644
index 0000000..4eef2d0
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc311-mnc480/donottranslate_config.xml
@@ -0,0 +1,27 @@
+<?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/Common/res/values-mcc312-mnc530/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc312-mnc530/donottranslate_config.xml
new file mode 100644
index 0000000..b16c85d
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc312-mnc530/donottranslate_config.xml
@@ -0,0 +1,32 @@
+<?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>
+
+    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
+    <string-array translatable="false" name="config_twoDigitNumberPattern">
+        <item>"*2"</item>
+    </string-array>
+
+    <!-- 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/Common/res/values-mcc505-mnc01/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc01/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc01/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc02/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc02/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc02/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc03/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc03/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc03/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc07/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc07/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc07/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc11/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc11/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc11/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc71/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc71/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc71/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc72/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc72/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc72/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values-mcc505-mnc90/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc90/donottranslate_config.xml
new file mode 100644
index 0000000..8c0c020
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc90/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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/Common/res/values/donottranslate_arrays.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml
new file mode 100644
index 0000000..41dc40a
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml
@@ -0,0 +1,35 @@
+<?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>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml
new file mode 100644
index 0000000..110ad49
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml
@@ -0,0 +1,88 @@
+<?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>
+    <!-- Config determines whether to update phone object when voice registration
+         state changes. Voice radio tech change will always trigger an update of
+         phone object irrespective of this config -->
+    <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
+
+    <!-- Boolean indicating if restoring network selection should be skipped -->
+    <!-- The restoring is handled by modem if it is true -->
+    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+
+    <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
+         is not necessarily the same as the number of phones/logical modems supported by the device.
+         For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots,
+         or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM
+         and one pSIM) -->
+    <integer name="config_num_physical_slots">2</integer>
+
+    <!-- Is the device capable of hot swapping an UICC Card -->
+    <bool name="config_hotswapCapable">true</bool>
+
+    <!-- An array of device capabilities defined by GSMA SGP.22 v2.0, and their corresponding major
+         version. -->
+    <string-array translatable="false" name="config_telephonyEuiccDeviceCapabilities">
+        <item>"gsm,11"</item>
+        <item>"utran,11"</item>
+        <item>"cdma1x,1"</item>
+        <item>"hrpd,3"</item>
+        <item>"ehrpd,12"</item>
+        <item>"eutran,11"</item>
+    </string-array>
+
+    <!-- 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,2441216,4096,16384,399360</item>
+        <item>hsupa:131072,262144,2441216,4096,16384,399360</item>
+        <item>hsdpa:131072,262144,2441216,4096,16384,399360</item>
+        <item>hspap:131072,262144,2441216,4096,16384,399360</item>
+        <item>edge:16384,32768,131072,4096,16384,65536</item>
+        <item>gprs:4096,8192,24576,4096,8192,24576</item>
+        <item>1xrtt:16384,32768,131070,4096,16384,102400</item>
+        <item>evdo:131072,262144,1048576,4096,16384,524288</item>
+        <item>lte:524288,1048576,8388608,262144,524288,4194304</item>
+    </string-array>
+
+    <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
+    <string name="config_ims_package" translatable="false">org.codeaurora.ims</string>
+
+    <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
+    <bool name="config_dynamic_bind_ims">true</bool>
+
+    <!-- Flag specifying whether VoLTE is availasble on device -->
+    <bool name="config_device_volte_available">true</bool>
+
+    <!-- Flag specifying whether VoLTE is available on device -->
+    <bool name="config_device_vt_available">true</bool>
+
+    <!-- Flag specifying whether WFC over IMS is availasble on device -->
+    <bool name="config_device_wfc_ims_available">true</bool>
+
+    <!-- Enable video pause workaround when enabling/disabling the camera. -->
+    <bool name="config_useVideoPauseWorkaround">true</bool>
+
+    <!-- Use ERI text for network name on CDMA LTE -->
+    <bool name="config_LTE_eri_for_network_name">true</bool>
+
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc310-mnc004/donottranslate_config.xml
new file mode 100644
index 0000000..edf7060
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc310-mnc004/donottranslate_config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, 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>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020e</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g020e/g020e.xml</string>
+
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc311-mnc230/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc311-mnc230/donottranslate_config.xml
new file mode 100644
index 0000000..1a69fc6
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc311-mnc230/donottranslate_config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, 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>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020g</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://pix.cspire.com/UA/profile/google/g020g/g020g.xml</string>
+
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc311-mnc480/donottranslate_config.xml
new file mode 100644
index 0000000..edf7060
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Sargo/res/values-mcc311-mnc480/donottranslate_config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2018, 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>
+
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020e</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g020e/g020e.xml</string>
+
+</resources>
diff --git a/rro_overlays/TelephonyOverlay/Sargo/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Sargo/res/values/donottranslate_config.xml
new file mode 100644
index 0000000..d302c73
--- /dev/null
+++ b/rro_overlays/TelephonyOverlay/Sargo/res/values/donottranslate_config.xml
@@ -0,0 +1,24 @@
+<?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>
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false">g020g</string>
+    <!-- MMS user agent profile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G020G.xml</string>
+</resources>