Merge "Use UserManager.removeUserOrSetEphemeral() to remove current user."

commit: 564eaec28369bf0217739d7ad1d9b9472c2b4c8b [log] [tgz]
author: TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 16 02:50:12 2020 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Mon Nov 16 02:50:12 2020 +0000
tree: 35d7cd647f5bbb0e5f796ddc832d12380a8d7728
parent: baa56fac456ebaee48d9a0e7c8db9fdece7314e0 [diff]
parent: 8031c0bbac74d9fcf12391f4b0bb5af7b45878a4 [diff]
diff --git a/res/layout/emergency_gesture_switch_bar.xml b/res/layout/emergency_gesture_switch_bar.xml
new file mode 100644
index 0000000..30c32f5
--- /dev/null
+++ b/res/layout/emergency_gesture_switch_bar.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<!-- For use in a LayoutPreference -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SwitchBar
+        android:id="@+id/switch_bar"
+        android:minHeight="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:paddingStart="0dp"
+        android:theme="?attr/switchBarTheme"/>
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/actionbar_subsettings_contentInsetStart"
+        android:layout_marginVertical="16dp"
+        android:text="@string/emergency_gesture_screen_summary"/>
+</LinearLayout>
\ No newline at end of file

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5ad7483..136aae4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -3653,7 +3653,7 @@
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ترتيب الإشعارات تلقائيًا حسب مدى الصلة بالموضوع"</string>
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تعليقات عن الإشعارات التكيُّفية"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"الإشارة إلى التعديلات التي تم إجراؤها على الإشعارات وإظهار خيار لتقديم تعليقات إلى النظام"</string>
-    <string name="asst_importance_reset_title" msgid="6191265591976440115">"إعادة ضبط أهمية الإشعار"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"إعادة ضبط أهمية الإشعارات"</string>
     <string name="asst_importance_reset_summary" msgid="684794589254282667">"إعادة ضبط إعدادات الأهمية التي غيّرها المستخدم والسماح لمساعد الإشعارات بمنح الأولوية"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"الإجراءات والردود المقترَحة"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"عرض الإجراءات والردود المقترحة تلقائيًا"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ded9785..f8605a6 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -3579,7 +3579,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Разговори без приоритет"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговори, в които сте направили промени"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Скорошни разговори"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Скорошни: Изчистване"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Изчистване на скорошни"</string>
     <string name="clear" msgid="5092178335409471100">"Изчистване"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показване на балонче за приоритетните разговори"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетните разговори се показват най-горе в падащия панел. Можете също да зададете да се поставят в балонче и да ви прекъсват, когато използвате режима „Не безпокойте“."</string>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f42a646..9aae69d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -3477,10 +3477,8 @@
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্রাসঙ্গিকতার ভিত্তিতে অটোমেটিক র‌্যাঙ্কিংয়ের বিজ্ঞপ্তি"</string>
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অ্যাডাপ্টিভ বিজ্ঞপ্তির মতামত"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"বিজ্ঞপ্তি দেখানোর ক্ষেত্রে করা পরিবর্তনগুলি জানায় এবং সিস্টেমে মতামত জানানোর বিকল্প দেখায়"</string>
-    <!-- no translation found for asst_importance_reset_title (6191265591976440115) -->
-    <skip />
-    <!-- no translation found for asst_importance_reset_summary (684794589254282667) -->
-    <skip />
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"বিজ্ঞপ্তির গুরুত্ব রিসেট করুন"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ব্যবহারকারীর পরিবর্তন করা গুরুত্বপূর্ণ সেটিংস রিসেট করুন এবং সেই সঙ্গে প্রাধান্য দেওয়ার জন্য বিজ্ঞপ্তি অ্যাসিস্ট্যান্টকে অনুমতি দিন"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"সাজেস্ট করা অ্যাকশন ও উত্তর"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"সাজেস্ট করা অ্যাকশন ও উত্তর অটোমেটিক দেখানো হয়"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"সাম্প্রতিক এবং স্নুজ করা বিজ্ঞপ্তি দেখুন"</string>
@@ -5015,16 +5013,11 @@
     <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth চালু হবে"</string>
     <string name="bluetooth_setting_on" msgid="4808458394436224124">"চালু আছে"</string>
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"বন্ধ আছে"</string>
-    <!-- no translation found for provider_internet_settings (3831259474776313323) -->
-    <skip />
-    <!-- no translation found for provider_network_settings_title (2624756136016346774) -->
-    <skip />
-    <!-- no translation found for airplane_safe_networks (8689587134664565669) -->
-    <skip />
-    <!-- no translation found for airplane_safe_networks_summary (8352420324632195912) -->
-    <skip />
-    <!-- no translation found for keywords_airplane_safe_networks (5902708537892978245) -->
-    <skip />
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ইন্টারনেট"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"সিম"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"বিমান-সুরক্ষা নেটওয়ার্ক"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"বিমান-সুরক্ষা নেটওয়ার্ক খুঁজে সেই পরিষেবাতে কানেক্ট করুন"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"বিমান, বিমান-সুরক্ষা"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"কল ও এসএমএস"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ওয়াই-ফাই কলিং"</string>
     <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"ওয়াই-ফাই নেটওয়ার্কের মতো পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করুন এবং কল রিসিভ করুন"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 92c6986..c3fa048 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -4848,58 +4848,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
     <string name="see_more" msgid="7499355691042812723">"Mehr anzeigen"</string>
     <string name="see_less" msgid="2642392725363552793">"Weniger anzeigen"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktivieren?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM aktivieren?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-Karte wechseln?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Es kann immer nur eine heruntergeladene eSIM aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zwischen ihnen wechselst, wird dein <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbindung zum Mobilfunknetz wird hergestellt…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Wechsel zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Mobilfunkanbieter kann nicht gewechselt werden"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Der Mobilfunkanbieter kann aufgrund eines Fehlers nicht gewechselt werden."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktivieren?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktivieren?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM wird deaktiviert<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Mobilfunkanbieter kann nicht deaktiviert werden"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ein Problem ist aufgetreten. Dein Mobilfunkanbieter konnte nicht deaktiviert werden."</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Zwei SIM-Karten verwenden?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Auf diesem Gerät können zwei SIM-Karten gleichzeitig aktiv sein. Wenn du weiterhin nur eine SIM-Karte verwenden möchtest, tippe auf „Nein danke“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Gerät neu starten?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Starte zuerst dein Gerät neu. Danach kannst du eine weitere SIM-Karte hinzufügen."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Weiter"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Neu starten"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nein danke"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Wechseln"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kann nicht aktiviert werden"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Nimm die SIM heraus und lege sie dann wieder ein. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Versuche, die SIM noch einmal zu aktivieren. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"Diese heruntergeladene SIM löschen?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"Wenn du diese SIM löschst, wird der <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-Dienst von diesem Gerät entfernt.\n\nDer Mobilfunkvertrag bei <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> wird dadurch nicht gekündigt."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Löschen"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b2a2dc0..ef14edb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -475,8 +475,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="7484150746479958376">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="8302873664348463041">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="3866488451639592071">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="4103951371711323192">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="6180866043921135548">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un schéma, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir les paramètres par défaut, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="5551608011810921471">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="6370330929679426136">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="4920087247177024521">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -496,11 +496,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="8104921337301750394">"Attention : Les données de votre appareil seront effacées si vous effectuez encore <xliff:g id="COUNT">^1</xliff:g> tentatives de déverrouillage infructueuses."</string>
     <string name="crypt_keeper_enter_password" msgid="1274917431075529732">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="8173654570682244149">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="5977961188966570342">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="1028716993071131029">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir les paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="5920153462176846037">"Échec du déchiffrement"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir sa configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="4420666705959562753">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="3200498792238652367">"Le mot de passe entré est correct. Malheureusement, vos données sont corrompues.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir ses paramètres par défaut. Une fois cette opération terminée, vous pourrez restaurer toutes les données que vous aviez sauvegardées dans votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_switch_input_method" msgid="7712732134989470573">"Changer le mode de saisie"</string>
     <string name="suggested_lock_settings_title" msgid="7836065447159730217">"Sécurisez votre téléphone"</string>
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Définir un verr. de l\'écran pour protéger la tablette"</string>
@@ -1824,9 +1824,9 @@
     <string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Pour plus de sécurité, tracez votre schéma professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"Pour plus de sécurité, entrez votre NIP professionnel"</string>
     <string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Pour plus de sécurité, entrez votre mot de passe professionnel"</string>
-    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le schéma précédent."</string>
-    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le NIP précédent."</string>
-    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"La configuration d\'usine du téléphone a été rétablie. Pour l\'utiliser, entrez le mot passe précédent."</string>
+    <string name="lockpassword_confirm_your_pattern_details_frp" msgid="6351784282865851482">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le schéma précédent."</string>
+    <string name="lockpassword_confirm_your_pin_details_frp" msgid="2128795640346033349">"Les paramètres par défaut du téléphone ont été rétablis. Pour l\'utiliser, entrez le NIP précédent."</string>
+    <string name="lockpassword_confirm_your_password_details_frp" msgid="4031863562975125016">"Paramètres par défaut du téléphone rétablis. Pour l\'utiliser, entrez le mot de passe précédent."</string>
     <string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Vérifier le schéma"</string>
     <string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Vérifier le NIP"</string>
     <string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Vérifier le mot de passe"</string>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 2fc170f..ca46aca 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -4847,58 +4847,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"જ્યારે <xliff:g id="CARRIER">%1$s</xliff:g> સાથે કનેક્ટ થયેલ હોય, ત્યારે ઉપલબ્ધ નથી"</string>
     <string name="see_more" msgid="7499355691042812723">"વધુ જુઓ"</string>
     <string name="see_less" msgid="2642392725363552793">"ઓછું જુઓ"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને ચાલુ કરીએ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"સિમ ચાલુ કરીએ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરીએ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"શું સિમ કાર્ડના ઉપયોગ પર સ્વિચ કરીએ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"એક સમયે માત્ર એક જ SIMને સક્રિય કરી શકાશે.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરવાથી <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"એક સમયે ડાઉનલોડ કરેલું માત્ર એક જ સિમ સક્રિય રહી શકશે.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરવાથી તમારી <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"એક સમયે માત્ર એક જ સિમને સક્રિય કરી શકાશે.\n\nસ્વિચ કરવાથી <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરો"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"નેટવર્ક સાથે કનેક્ટ કરી રહ્યાં છીએ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરી રહ્યાં છીએ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"મોબાઇલ ઑપરેટર સ્વિચ કરી શકાતા નથી"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"કોઈ ભૂલને કારણે મોબાઇલ ઑપરેટર સ્વિચ કરી શકાતા નથી."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને બંધ કરીએ?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"સિમ કાર્ડ બંધ કરીએ?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"સિમ કાર્ડ બંધ કરી રહ્યાં છીએ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"મોબાઇલ ઑપરેટરને બંધ કરી શકાતા નથી"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"કંઈક ખોટું થયું હતું અને તમારા મોબાઇલ ઑપરેટરને બંધ કરી શક્યાં નથી."</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 સિમનો ઉપયોગ કરીએ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"આ ડિવાઇસમાં એકવારમાં 2 સિમ સક્રિય થઈ શકે છે. એકવારમાં 1 જ સિમનો ઉપયોગ કરવાનું ચાલુ રાખવા માટે, \"ના, આભાર\" પર ટૅપ કરો."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ડિવાઇસ ફરી શરૂ કરીએ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"પ્રારંભ કરવા માટે, તમારા ડિવાઇસને ફરી શરૂ કરો. પછી તમે બીજું સિમ ઉમેરી શકો છો."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"આગળ વધો"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ફરી શરૂ કરો"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ના, આભાર"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"સ્વિચ કરો"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"સિમ કાર્ડ સક્રિય કરી શકાતું નથી"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"સિમ કાર્ડ કાઢી નાખો અને તેને ફરીથી દાખલ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"સિમ કાર્ડ ફરીથી ચાલુ કરવાનો પ્રયાસ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"આ ડાઉનલોડ કરેલું સિમ કાઢી નાખીએ?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"આ સિમ કાઢી નાખવાથી આ ડિવાઇસમાંથી <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> સેવા કાઢી નાખવામાં આવશે.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> માટેની સેવા રદ નહીં થાય."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"કાઢી નાખો"</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9318bbf..0b6c900 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -3478,7 +3478,7 @@
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Бейімделетін хабарландырулар туралы пікірлер"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Хабарландыруларға жасалған түзетулерді көрсетеді және жүйеге пікір жіберуді ұсынады"</string>
     <string name="asst_importance_reset_title" msgid="6191265591976440115">"Хабарландырулардың маңыздылық параметрлерін бастапқы күйге қайтару"</string>
-    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Пайдаланушы өзгерткен маңыздылық параметрлерін бастапқы күйге қайтарып, басымдықты хабарландыру көмекшісі таңдауына рұқсат етіңіз"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Пайдаланушы өзгерткен маңыздылық параметрлерін бастапқы күйге қайтарып, хабарландыру көмекшісінің басымдықты анықтауына рұқсат ету"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ұсынылған әрекеттер және жауаптар"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ұсынылған әрекеттер мен жауаптарды автоматты түрде көрсету"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Соңғы және кейінге қалған хабарландыруларды көрсету"</string>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 62b6e1c..294a698 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -4847,58 +4847,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
     <string name="see_more" msgid="7499355691042812723">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
     <string name="see_less" msgid="2642392725363552793">"ಕಡಿಮೆ ನೋಡಿ"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಬೇಕೇ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ಬಳಸುತ್ತಿರುವ ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗೆ ಬದಲಿಸಬೇಕೇ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು SIM ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸುವುದರಿಂದ, ನಿಮ್ಮ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸುವುದರಿಂದ, ನಿಮ್ಮ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು ಸಿಮ್ ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\nಸಿಮ್‌ಗಳನ್ನು ಬದಲಿಸುವುದರಿಂದ ನಿಮ್ಮ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಿ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ದೋಷವೊಂದರ ಕಾರಣದಿಂದಾಗಿ ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ಏನೋ ತಪ್ಪಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ಸಿಮ್‌ಗಳನ್ನು ಬಳಸಬೇಕೇ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ಈ ಸಾಧನವು ಒಂದೇ ಬಾರಿಗೆ 2 ಸಕ್ರಿಯ ಸಿಮ್‌ಗಳನ್ನು ಹೊಂದಿರಬಹುದು. ಒಂದು ಬಾರಿಗೆ 1 ಸಿಮ್ ಬಳಸುವುದನ್ನು ಮುಂದುವರಿಸಲು \"ಧನ್ಯವಾದಗಳು\" ಎಂಬುದನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬೇಕೇ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ. ನಂತರ ನೀವು ಮತ್ತೊಂದು ಸಿಮ್‌ ಅನ್ನು ಸೇರಿಸಬಹುದು."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ಮುಂದುವರಿಸಿ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ಧನ್ಯವಾದಗಳು"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ಬದಲಿಸಿ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ಸಿಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ಸಿಮ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಅದನ್ನು ಮತ್ತೆ ಸೇರಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ಸಿಮ್ ಅನ್ನು ಮತ್ತೆ ಆನ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸುವುದೇ?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸುವುದರಿಂದ, ಅದು ಈ ಸಾಧನದಿಂದ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ಸೇವೆಯನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ಗಾಗಿ ಇರುವ ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ಅಳಿಸಿ"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4f18060..179e10d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -3478,7 +3478,7 @@
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"적응형 알림 의견"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"알림의 수정사항을 표시하며 시스템에 의견을 제공하는 옵션을 보여줍니다."</string>
     <string name="asst_importance_reset_title" msgid="6191265591976440115">"알림 중요도 재설정"</string>
-    <string name="asst_importance_reset_summary" msgid="684794589254282667">"사용자가 변경한 중요도 설정을 재설정하고 알림 어시스턴트가 우선순위 지정하도록 허용합니다."</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"사용자가 변경한 중요도 설정을 재설정하고 알림 어시스턴트가 우선순위를 지정하도록 허용합니다."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"추천 작업 및 답장"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"추천 작업 및 답장을 자동으로 표시"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"최근 알림 및 일시 중지된 알림 표시"</string>

diff --git a/res/values-mcc222-af/strings.xml b/res/values-mcc222-af/strings.xml
new file mode 100644
index 0000000..6eaa68b
--- /dev/null
+++ b/res/values-mcc222-af/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Publieke waarskuwings"</string>
+</resources>

diff --git a/res/values-mcc222-am/strings.xml b/res/values-mcc222-am/strings.xml
new file mode 100644
index 0000000..4476eed
--- /dev/null
+++ b/res/values-mcc222-am/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ይፋዊ ማስጠንቀቂያዎች"</string>
+</resources>

diff --git a/res/values-mcc222-ar/strings.xml b/res/values-mcc222-ar/strings.xml
new file mode 100644
index 0000000..c86d2a3
--- /dev/null
+++ b/res/values-mcc222-ar/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"تحذيرات عامة"</string>
+</resources>

diff --git a/res/values-mcc222-as/strings.xml b/res/values-mcc222-as/strings.xml
new file mode 100644
index 0000000..5c3cd94
--- /dev/null
+++ b/res/values-mcc222-as/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ৰাজহুৱা সকীয়নিসমূহ"</string>
+</resources>

diff --git a/res/values-mcc222-az/strings.xml b/res/values-mcc222-az/strings.xml
new file mode 100644
index 0000000..95a9822
--- /dev/null
+++ b/res/values-mcc222-az/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"İctimai xəbərdarlıqlar"</string>
+</resources>

diff --git a/res/values-mcc222-b+sr+Latn/strings.xml b/res/values-mcc222-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..db6c956
--- /dev/null
+++ b/res/values-mcc222-b+sr+Latn/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Javna upozorenja"</string>
+</resources>

diff --git a/res/values-mcc222-be/strings.xml b/res/values-mcc222-be/strings.xml
new file mode 100644
index 0000000..e6174a6
--- /dev/null
+++ b/res/values-mcc222-be/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Папярэджанні насельніцтва"</string>
+</resources>

diff --git a/res/values-mcc222-bg/strings.xml b/res/values-mcc222-bg/strings.xml
new file mode 100644
index 0000000..9708ded
--- /dev/null
+++ b/res/values-mcc222-bg/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Публични предупреждения"</string>
+</resources>

diff --git a/res/values-mcc222-bn/strings.xml b/res/values-mcc222-bn/strings.xml
new file mode 100644
index 0000000..c517922
--- /dev/null
+++ b/res/values-mcc222-bn/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"পাবলিক ওয়ার্নিং"</string>
+</resources>

diff --git a/res/values-mcc222-bs/strings.xml b/res/values-mcc222-bs/strings.xml
new file mode 100644
index 0000000..db6c956
--- /dev/null
+++ b/res/values-mcc222-bs/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Javna upozorenja"</string>
+</resources>

diff --git a/res/values-mcc222-ca/strings.xml b/res/values-mcc222-ca/strings.xml
new file mode 100644
index 0000000..e454e61
--- /dev/null
+++ b/res/values-mcc222-ca/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Advertiments públics"</string>
+</resources>

diff --git a/res/values-mcc222-cs/strings.xml b/res/values-mcc222-cs/strings.xml
new file mode 100644
index 0000000..6419c61
--- /dev/null
+++ b/res/values-mcc222-cs/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Veřejná upozornění"</string>
+</resources>

diff --git a/res/values-mcc222-da/strings.xml b/res/values-mcc222-da/strings.xml
new file mode 100644
index 0000000..4a82702
--- /dev/null
+++ b/res/values-mcc222-da/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Advarsler fra myndighederne"</string>
+</resources>

diff --git a/res/values-mcc222-de/strings.xml b/res/values-mcc222-de/strings.xml
new file mode 100644
index 0000000..5c93f38
--- /dev/null
+++ b/res/values-mcc222-de/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Öffentliche Warnungen"</string>
+</resources>

diff --git a/res/values-mcc222-el/strings.xml b/res/values-mcc222-el/strings.xml
new file mode 100644
index 0000000..a3c4c73
--- /dev/null
+++ b/res/values-mcc222-el/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Δημόσιες ειδοποιήσεις"</string>
+</resources>

diff --git a/res/values-mcc222-en-rAU/strings.xml b/res/values-mcc222-en-rAU/strings.xml
new file mode 100644
index 0000000..354ed9e
--- /dev/null
+++ b/res/values-mcc222-en-rAU/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
+</resources>

diff --git a/res/values-mcc222-en-rCA/strings.xml b/res/values-mcc222-en-rCA/strings.xml
new file mode 100644
index 0000000..354ed9e
--- /dev/null
+++ b/res/values-mcc222-en-rCA/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
+</resources>

diff --git a/res/values-mcc222-en-rGB/strings.xml b/res/values-mcc222-en-rGB/strings.xml
new file mode 100644
index 0000000..354ed9e
--- /dev/null
+++ b/res/values-mcc222-en-rGB/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
+</resources>

diff --git a/res/values-mcc222-en-rIN/strings.xml b/res/values-mcc222-en-rIN/strings.xml
new file mode 100644
index 0000000..354ed9e
--- /dev/null
+++ b/res/values-mcc222-en-rIN/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Public warnings"</string>
+</resources>

diff --git a/res/values-mcc222-en-rXC/strings.xml b/res/values-mcc222-en-rXC/strings.xml
new file mode 100644
index 0000000..57aacfa
--- /dev/null
+++ b/res/values-mcc222-en-rXC/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎Public warnings‎‏‎‎‏‎"</string>
+</resources>

diff --git a/res/values-mcc222-es-rUS/strings.xml b/res/values-mcc222-es-rUS/strings.xml
new file mode 100644
index 0000000..47dd780
--- /dev/null
+++ b/res/values-mcc222-es-rUS/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Advertencias públicas"</string>
+</resources>

diff --git a/res/values-mcc222-es/strings.xml b/res/values-mcc222-es/strings.xml
new file mode 100644
index 0000000..47dd780
--- /dev/null
+++ b/res/values-mcc222-es/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Advertencias públicas"</string>
+</resources>

diff --git a/res/values-mcc222-et/strings.xml b/res/values-mcc222-et/strings.xml
new file mode 100644
index 0000000..60b46b4
--- /dev/null
+++ b/res/values-mcc222-et/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Avalikud hoiatused"</string>
+</resources>

diff --git a/res/values-mcc222-eu/strings.xml b/res/values-mcc222-eu/strings.xml
new file mode 100644
index 0000000..be8a91a
--- /dev/null
+++ b/res/values-mcc222-eu/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Abisu publikoak"</string>
+</resources>

diff --git a/res/values-mcc222-fa/strings.xml b/res/values-mcc222-fa/strings.xml
new file mode 100644
index 0000000..8959434
--- /dev/null
+++ b/res/values-mcc222-fa/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"هشدارهای عمومی"</string>
+</resources>

diff --git a/res/values-mcc222-fi/strings.xml b/res/values-mcc222-fi/strings.xml
new file mode 100644
index 0000000..c36dc9f
--- /dev/null
+++ b/res/values-mcc222-fi/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Yleiset varoitukset"</string>
+</resources>

diff --git a/res/values-mcc222-fr-rCA/strings.xml b/res/values-mcc222-fr-rCA/strings.xml
new file mode 100644
index 0000000..3f26aa1
--- /dev/null
+++ b/res/values-mcc222-fr-rCA/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Avertissements publics"</string>
+</resources>

diff --git a/res/values-mcc222-fr/strings.xml b/res/values-mcc222-fr/strings.xml
new file mode 100644
index 0000000..3f26aa1
--- /dev/null
+++ b/res/values-mcc222-fr/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Avertissements publics"</string>
+</resources>

diff --git a/res/values-mcc222-gl/strings.xml b/res/values-mcc222-gl/strings.xml
new file mode 100644
index 0000000..47dd780
--- /dev/null
+++ b/res/values-mcc222-gl/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Advertencias públicas"</string>
+</resources>

diff --git a/res/values-mcc222-gu/strings.xml b/res/values-mcc222-gu/strings.xml
new file mode 100644
index 0000000..f7cd2d0
--- /dev/null
+++ b/res/values-mcc222-gu/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"સાર્વજનિક ચેતવણીઓ"</string>
+</resources>

diff --git a/res/values-mcc222-hi/strings.xml b/res/values-mcc222-hi/strings.xml
new file mode 100644
index 0000000..b1a356b
--- /dev/null
+++ b/res/values-mcc222-hi/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"सार्वजनिक चेतावनियां"</string>
+</resources>

diff --git a/res/values-mcc222-hr/strings.xml b/res/values-mcc222-hr/strings.xml
new file mode 100644
index 0000000..db6c956
--- /dev/null
+++ b/res/values-mcc222-hr/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Javna upozorenja"</string>
+</resources>

diff --git a/res/values-mcc222-hu/strings.xml b/res/values-mcc222-hu/strings.xml
new file mode 100644
index 0000000..589664c
--- /dev/null
+++ b/res/values-mcc222-hu/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Nyilvános figyelmeztetések"</string>
+</resources>

diff --git a/res/values-mcc222-hy/strings.xml b/res/values-mcc222-hy/strings.xml
new file mode 100644
index 0000000..b7cfefb
--- /dev/null
+++ b/res/values-mcc222-hy/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Հանրային ազդարարում"</string>
+</resources>

diff --git a/res/values-mcc222-in/strings.xml b/res/values-mcc222-in/strings.xml
new file mode 100644
index 0000000..51d4827
--- /dev/null
+++ b/res/values-mcc222-in/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Peringatan publik"</string>
+</resources>

diff --git a/res/values-mcc222-is/strings.xml b/res/values-mcc222-is/strings.xml
new file mode 100644
index 0000000..b61c04a
--- /dev/null
+++ b/res/values-mcc222-is/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Opinberar viðvaranir"</string>
+</resources>

diff --git a/res/values-mcc222-it/strings.xml b/res/values-mcc222-it/strings.xml
new file mode 100644
index 0000000..46258ff
--- /dev/null
+++ b/res/values-mcc222-it/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Avvisi pubblici"</string>
+</resources>

diff --git a/res/values-mcc222-iw/strings.xml b/res/values-mcc222-iw/strings.xml
new file mode 100644
index 0000000..a123492
--- /dev/null
+++ b/res/values-mcc222-iw/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"אזהרות גלויות לכול"</string>
+</resources>

diff --git a/res/values-mcc222-ja/strings.xml b/res/values-mcc222-ja/strings.xml
new file mode 100644
index 0000000..7bf2e8b
--- /dev/null
+++ b/res/values-mcc222-ja/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"一般公開警告"</string>
+</resources>

diff --git a/res/values-mcc222-ka/strings.xml b/res/values-mcc222-ka/strings.xml
new file mode 100644
index 0000000..71f5c6d
--- /dev/null
+++ b/res/values-mcc222-ka/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"საჯარო გაფრთხილებები"</string>
+</resources>

diff --git a/res/values-mcc222-kk/strings.xml b/res/values-mcc222-kk/strings.xml
new file mode 100644
index 0000000..c2bcc4e
--- /dev/null
+++ b/res/values-mcc222-kk/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Жария ескертулер"</string>
+</resources>

diff --git a/res/values-mcc222-km/strings.xml b/res/values-mcc222-km/strings.xml
new file mode 100644
index 0000000..e2ae6ae
--- /dev/null
+++ b/res/values-mcc222-km/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ការព្រមានជាសាធារណៈ"</string>
+</resources>

diff --git a/res/values-mcc222-kn/strings.xml b/res/values-mcc222-kn/strings.xml
new file mode 100644
index 0000000..77b6ebd
--- /dev/null
+++ b/res/values-mcc222-kn/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ಸಾರ್ವಜನಿಕ ಎಚ್ಚರಿಕೆಗಳು"</string>
+</resources>

diff --git a/res/values-mcc222-ko/strings.xml b/res/values-mcc222-ko/strings.xml
new file mode 100644
index 0000000..ffff672
--- /dev/null
+++ b/res/values-mcc222-ko/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"공개 주의사항"</string>
+</resources>

diff --git a/res/values-mcc222-ky/strings.xml b/res/values-mcc222-ky/strings.xml
new file mode 100644
index 0000000..32da66c
--- /dev/null
+++ b/res/values-mcc222-ky/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Коомдук билдирүү"</string>
+</resources>

diff --git a/res/values-mcc222-lo/strings.xml b/res/values-mcc222-lo/strings.xml
new file mode 100644
index 0000000..7bd79d0
--- /dev/null
+++ b/res/values-mcc222-lo/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ຄຳເຕືອນສາທາລະນະ"</string>
+</resources>

diff --git a/res/values-mcc222-lt/strings.xml b/res/values-mcc222-lt/strings.xml
new file mode 100644
index 0000000..452e8a3
--- /dev/null
+++ b/res/values-mcc222-lt/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Vieši įspėjimai"</string>
+</resources>

diff --git a/res/values-mcc222-lv/strings.xml b/res/values-mcc222-lv/strings.xml
new file mode 100644
index 0000000..0d8c870
--- /dev/null
+++ b/res/values-mcc222-lv/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Publiski brīdinājumi"</string>
+</resources>

diff --git a/res/values-mcc222-mk/strings.xml b/res/values-mcc222-mk/strings.xml
new file mode 100644
index 0000000..c56203f
--- /dev/null
+++ b/res/values-mcc222-mk/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Јавни предупредувања"</string>
+</resources>

diff --git a/res/values-mcc222-ml/strings.xml b/res/values-mcc222-ml/strings.xml
new file mode 100644
index 0000000..3adb22a
--- /dev/null
+++ b/res/values-mcc222-ml/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"പൊതു മുന്നറിയിപ്പുകൾ"</string>
+</resources>

diff --git a/res/values-mcc222-mn/strings.xml b/res/values-mcc222-mn/strings.xml
new file mode 100644
index 0000000..8d72763
--- /dev/null
+++ b/res/values-mcc222-mn/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Олон нийтийн сануулга"</string>
+</resources>

diff --git a/res/values-mcc222-mr/strings.xml b/res/values-mcc222-mr/strings.xml
new file mode 100644
index 0000000..81294d7
--- /dev/null
+++ b/res/values-mcc222-mr/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"सार्वजनिक चेतावण्या"</string>
+</resources>

diff --git a/res/values-mcc222-ms/strings.xml b/res/values-mcc222-ms/strings.xml
new file mode 100644
index 0000000..2986d01
--- /dev/null
+++ b/res/values-mcc222-ms/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Amaran umum"</string>
+</resources>

diff --git a/res/values-mcc222-my/strings.xml b/res/values-mcc222-my/strings.xml
new file mode 100644
index 0000000..c1fa733
--- /dev/null
+++ b/res/values-mcc222-my/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"လူထု သတိပေးချက်များ"</string>
+</resources>

diff --git a/res/values-mcc222-nb/strings.xml b/res/values-mcc222-nb/strings.xml
new file mode 100644
index 0000000..c52c65c
--- /dev/null
+++ b/res/values-mcc222-nb/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Offentlige advarsler"</string>
+</resources>

diff --git a/res/values-mcc222-ne/strings.xml b/res/values-mcc222-ne/strings.xml
new file mode 100644
index 0000000..005c533
--- /dev/null
+++ b/res/values-mcc222-ne/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"सार्वजनिक चेतावनी"</string>
+</resources>

diff --git a/res/values-mcc222-nl/strings.xml b/res/values-mcc222-nl/strings.xml
new file mode 100644
index 0000000..5e44eda
--- /dev/null
+++ b/res/values-mcc222-nl/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Openbare waarschuwingen"</string>
+</resources>

diff --git a/res/values-mcc222-or/strings.xml b/res/values-mcc222-or/strings.xml
new file mode 100644
index 0000000..a3b3b6d
--- /dev/null
+++ b/res/values-mcc222-or/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ସାର୍ବଜନୀନ ଚେତାବନୀ"</string>
+</resources>

diff --git a/res/values-mcc222-pa/strings.xml b/res/values-mcc222-pa/strings.xml
new file mode 100644
index 0000000..8224ab8
--- /dev/null
+++ b/res/values-mcc222-pa/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"ਜਨਤਕ ਚਿਤਾਵਨੀਆਂ"</string>
+</resources>

diff --git a/res/values-mcc222-pl/strings.xml b/res/values-mcc222-pl/strings.xml
new file mode 100644
index 0000000..5e06ac5
--- /dev/null
+++ b/res/values-mcc222-pl/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Ostrzeżenia publiczne"</string>
+</resources>

diff --git a/res/values-mcc222-pt-rBR/strings.xml b/res/values-mcc222-pt-rBR/strings.xml
new file mode 100644
index 0000000..901d67f
--- /dev/null
+++ b/res/values-mcc222-pt-rBR/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Alertas públicos"</string>
+</resources>

diff --git a/res/values-mcc222-pt-rPT/strings.xml b/res/values-mcc222-pt-rPT/strings.xml
new file mode 100644
index 0000000..63b4057
--- /dev/null
+++ b/res/values-mcc222-pt-rPT/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Avisos públicos"</string>
+</resources>

diff --git a/res/values-mcc222-pt/strings.xml b/res/values-mcc222-pt/strings.xml
new file mode 100644
index 0000000..901d67f
--- /dev/null
+++ b/res/values-mcc222-pt/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Alertas públicos"</string>
+</resources>

diff --git a/res/values-mcc222-ro/strings.xml b/res/values-mcc222-ro/strings.xml
new file mode 100644
index 0000000..834ac06
--- /dev/null
+++ b/res/values-mcc222-ro/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Avertismente publice"</string>
+</resources>

diff --git a/res/values-mcc222-ru/strings.xml b/res/values-mcc222-ru/strings.xml
new file mode 100644
index 0000000..07f805b
--- /dev/null
+++ b/res/values-mcc222-ru/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Общедоступные предупреждения"</string>
+</resources>

diff --git a/res/values-mcc222-si/strings.xml b/res/values-mcc222-si/strings.xml
new file mode 100644
index 0000000..1dfbbc0
--- /dev/null
+++ b/res/values-mcc222-si/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"පොදු අනතුරු ඇඟවීම්"</string>
+</resources>

diff --git a/res/values-mcc222-sk/strings.xml b/res/values-mcc222-sk/strings.xml
new file mode 100644
index 0000000..5552de7
--- /dev/null
+++ b/res/values-mcc222-sk/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Verejné upozornenia"</string>
+</resources>

diff --git a/res/values-mcc222-sl/strings.xml b/res/values-mcc222-sl/strings.xml
new file mode 100644
index 0000000..91a26f0
--- /dev/null
+++ b/res/values-mcc222-sl/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Javna opozorila"</string>
+</resources>

diff --git a/res/values-mcc222-sq/strings.xml b/res/values-mcc222-sq/strings.xml
new file mode 100644
index 0000000..c0b9a2c
--- /dev/null
+++ b/res/values-mcc222-sq/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Paralajmërime publike"</string>
+</resources>

diff --git a/res/values-mcc222-sr/strings.xml b/res/values-mcc222-sr/strings.xml
new file mode 100644
index 0000000..ee23e46
--- /dev/null
+++ b/res/values-mcc222-sr/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Јавна упозорења"</string>
+</resources>

diff --git a/res/values-mcc222-sv/strings.xml b/res/values-mcc222-sv/strings.xml
new file mode 100644
index 0000000..7216209
--- /dev/null
+++ b/res/values-mcc222-sv/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Varningar till allmänheten"</string>
+</resources>

diff --git a/res/values-mcc222-sw/strings.xml b/res/values-mcc222-sw/strings.xml
new file mode 100644
index 0000000..40c147f
--- /dev/null
+++ b/res/values-mcc222-sw/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Ilani za umma"</string>
+</resources>

diff --git a/res/values-mcc222-ta/strings.xml b/res/values-mcc222-ta/strings.xml
new file mode 100644
index 0000000..31ac452
--- /dev/null
+++ b/res/values-mcc222-ta/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"பொது எச்சரிக்கைகள்"</string>
+</resources>

diff --git a/res/values-mcc222-te/strings.xml b/res/values-mcc222-te/strings.xml
new file mode 100644
index 0000000..ca80977
--- /dev/null
+++ b/res/values-mcc222-te/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"పబ్లిక్ హెచ్చరికలు"</string>
+</resources>

diff --git a/res/values-mcc222-th/strings.xml b/res/values-mcc222-th/strings.xml
new file mode 100644
index 0000000..ee78171
--- /dev/null
+++ b/res/values-mcc222-th/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"คำเตือนสาธารณะ"</string>
+</resources>

diff --git a/res/values-mcc222-tl/strings.xml b/res/values-mcc222-tl/strings.xml
new file mode 100644
index 0000000..c968954
--- /dev/null
+++ b/res/values-mcc222-tl/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Mga pampublikong babala"</string>
+</resources>

diff --git a/res/values-mcc222-tr/strings.xml b/res/values-mcc222-tr/strings.xml
new file mode 100644
index 0000000..a8d51cf
--- /dev/null
+++ b/res/values-mcc222-tr/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Herkese açık uyarılar"</string>
+</resources>

diff --git a/res/values-mcc222-uk/strings.xml b/res/values-mcc222-uk/strings.xml
new file mode 100644
index 0000000..419c9f4
--- /dev/null
+++ b/res/values-mcc222-uk/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Попередження для всіх"</string>
+</resources>

diff --git a/res/values-mcc222-ur/strings.xml b/res/values-mcc222-ur/strings.xml
new file mode 100644
index 0000000..0c049b7
--- /dev/null
+++ b/res/values-mcc222-ur/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"عوامی وارننگز"</string>
+</resources>

diff --git a/res/values-mcc222-uz/strings.xml b/res/values-mcc222-uz/strings.xml
new file mode 100644
index 0000000..cd849a6
--- /dev/null
+++ b/res/values-mcc222-uz/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Ommaviy ogohlantirishlar"</string>
+</resources>

diff --git a/res/values-mcc222-vi/strings.xml b/res/values-mcc222-vi/strings.xml
new file mode 100644
index 0000000..caaedf3
--- /dev/null
+++ b/res/values-mcc222-vi/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Cảnh báo công khai"</string>
+</resources>

diff --git a/res/values-mcc222-zh-rCN/strings.xml b/res/values-mcc222-zh-rCN/strings.xml
new file mode 100644
index 0000000..3344e4d
--- /dev/null
+++ b/res/values-mcc222-zh-rCN/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"公共警告"</string>
+</resources>

diff --git a/res/values-mcc222-zh-rHK/strings.xml b/res/values-mcc222-zh-rHK/strings.xml
new file mode 100644
index 0000000..6a23337
--- /dev/null
+++ b/res/values-mcc222-zh-rHK/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"公共警報"</string>
+</resources>

diff --git a/res/values-mcc222-zh-rTW/strings.xml b/res/values-mcc222-zh-rTW/strings.xml
new file mode 100644
index 0000000..6a23337
--- /dev/null
+++ b/res/values-mcc222-zh-rTW/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"公共警報"</string>
+</resources>

diff --git a/res/values-mcc222-zu/strings.xml b/res/values-mcc222-zu/strings.xml
new file mode 100644
index 0000000..dba801c
--- /dev/null
+++ b/res/values-mcc222-zu/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cell_broadcast_settings" msgid="6933671701347224770">"Izexwayiso zasesidlangalaleni"</string>
+</resources>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 3b8d4c1..f680ab2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -3478,7 +3478,7 @@
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратни информации за приспособливи известувања"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означувај ги приспособувањата извршени на известувањата и прикажувај ја опцијата за обезбедување повратни информации на системот"</string>
     <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ресетирајте ја важноста на известувањата"</string>
-    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ресетирајте ги поставките за важност променети од корисникот и дозволете помошникот за известувања да задава приоритети"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ресетирајте ги поставките за важност променети од корисникот и дозволете помошникот за известувања да одредува приоритети"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени дејства и одговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматски прикажувај предложени дејства и одговори"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Прикажувај неодамнешни и одложени известувања"</string>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 6b949bf..74941c0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -3478,10 +3478,8 @@
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"उपयुक्ततेनुसार सूचनांना आपोआप रँक करा"</string>
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"अडॅप्टिव्ह सूचना फीडबॅक"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनांमध्ये केलेल्‍या अ‍ॅडजस्टमेंट दाखवा आणि सिस्‍टममध्ये फीडबॅक देण्याचा पर्याय नमूद करा"</string>
-    <!-- no translation found for asst_importance_reset_title (6191265591976440115) -->
-    <skip />
-    <!-- no translation found for asst_importance_reset_summary (684794589254282667) -->
-    <skip />
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचनेचे महत्त्व रीसेट करा"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"वापरकर्त्याने बदललेली महत्त्वपूर्ण सेटिंग्ज रीसेट करा आणि सूचना असिस्टंटला प्राधान्य देण्याची परवानगी द्या"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुचवलेली कृती आणि उत्तरे"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुचवलेली कृती आणि उत्तरे आपोआप दाखवा"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"अलीकडील आणि स्नूझ केलेल्या सूचना दाखवा"</string>
@@ -4850,58 +4848,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
     <string name="see_more" msgid="7499355691042812723">"आणखी पाहा"</string>
     <string name="see_less" msgid="2642392725363552793">"कमी पहा"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सुरू करायचे आहे का?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"सिम सुरू करायचे आहे का?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करायचे आहे का?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"सिम कार्ड वापरण्यावर स्विच करायचे आहे का?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एका वेळी एक सिम अ‍ॅक्टिव्ह असू शकते.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> वर स्विच केल्याने तुमची <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> सेवा रद्द होणार नाही."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एका वेळी डाउनलोड केलेले फक्त एकच सिम अ‍ॅक्टिव्ह असू शकते.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> वर स्विच केल्याने तुमच्या <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> सेवा रद्द होणार नाहीत."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एकावेळी एकच सिम अ‍ॅक्टिव्ह असू शकते.\n\nस्विच केल्याने तुमची <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> सेवा रद्द होणार नाही."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करा"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्कशी कनेक्ट करत आहे…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करत आहे"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"वाहक स्विच करू शकत नाही"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"एररमुळे वाहक स्विच करू शकत नाही."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> बंद करायचे आहे का?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"सिम बंद करायचे आहे का?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद करत आहे<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"वाहक बंद करू शकत नाही"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"काहीतरी गडबड झाली आणि तुमचा वाहक बंद करता आला नाही."</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"दोन सिम वापरायची आहेत का?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"या डिव्हाइसमध्ये एकाच वेळी दोन सिम अ‍ॅक्टिव्ह असू शकतात. एकावेळी एक सिम वापरणे सुरू ठेवण्यासाठी, \"नाही, नको\" वर टॅप करा."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"डिव्हाइस रीस्टार्ट करायचे आहे का?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"सुरुवात करण्यासाठी, तुमचे डिव्हाइस रीस्टार्ट करा. नंतर तुम्ही दुसरे सिम जोडू शकता."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"पुढे सुरू ठेवा"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करा"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"नाही, नको"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"स्विच करा"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम ॲक्टिव्हेट करू शकत नाही"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम काढा आणि ते पुन्हा घाला. समस्या कायम राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम पुन्हा सुरू करून पाहा. समस्या सुरू राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"हे डाउनलोड केलेले सिम मिटवायचे?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"हे सिम मिटवल्याने या डिव्हाइसवरून <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> सेवा काढली जाते.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ची सेवा रद्द केली जाणार नाही."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"मिटवा"</string>
@@ -5040,16 +5014,11 @@
     <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ सुरू होईल"</string>
     <string name="bluetooth_setting_on" msgid="4808458394436224124">"सुरू करा"</string>
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद करा"</string>
-    <!-- no translation found for provider_internet_settings (3831259474776313323) -->
-    <skip />
-    <!-- no translation found for provider_network_settings_title (2624756136016346774) -->
-    <skip />
-    <!-- no translation found for airplane_safe_networks (8689587134664565669) -->
-    <skip />
-    <!-- no translation found for airplane_safe_networks_summary (8352420324632195912) -->
-    <skip />
-    <!-- no translation found for keywords_airplane_safe_networks (5902708537892978245) -->
-    <skip />
+    <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"विमानामध्ये वापरण्यासाठी सुरक्षित असलेले नेटवर्क"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"विमानामध्ये वापरण्यासाठी सुरक्षित असलेले नेटवर्क शोधा आणि कनेक्ट करा"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"विमान, विमान सुरक्षित"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"कॉल आणि एसएमएस"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"वाय-फाय कॉलिंग"</string>
     <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"वाय-फाय यांसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करा आणि घ्या"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index aa33e16..9e016fc 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -3477,10 +3477,8 @@
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"सन्दर्भअनुसार सूचनाहरू स्वतः श्रेणीबद्ध गर्नुहोस्"</string>
     <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"परिस्थितिअनुसार प्राप्त हुने सूचनाबारे प्रतिक्रिया"</string>
     <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनाहरूमा गरिएको समायोजनबारे सूचित गर्छ र सिस्टमका बारेमा प्रतिक्रिया दिने विकल्प देखाउँछ"</string>
-    <!-- no translation found for asst_importance_reset_title (6191265591976440115) -->
-    <skip />
-    <!-- no translation found for asst_importance_reset_summary (684794589254282667) -->
-    <skip />
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचनाको प्राथमिकता रिसेट गर्नुहोस्"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"प्रयोगकर्ताले परिवर्तन गरेका प्राथमिकतासम्बन्धी सेटिङ रिसेट गर्नुहोस् र सूचना सहायकलाई प्राथमिकता तय गर्ने अनुमति दिनुहोस्"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सिफारिस गरिएका कारबाही तथा जवाफहरू"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सिफारिस गरिएका कारबाही तथा जवाफहरू स्वतः देखाउनुहोस्"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"हालका र स्नुज गरिएका सूचनाहरू देखाउनुहोस्"</string>
@@ -4849,58 +4847,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
     <string name="see_more" msgid="7499355691042812723">"थप हेर्नुहोस्"</string>
     <string name="see_less" msgid="2642392725363552793">"कम हेर्नुहोस्"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सक्रिय गर्ने हो?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM सक्रिय गर्ने हो?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पार्ने हो?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"यो SIM बदलेर प्रयोग भइरहेको SIM प्रयोग गर्ने हो?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक पटकमा एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nयसलाई बदलेर <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> बनाउँदा तपाईंको <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> को सेवा रद्द हुँदैन।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक पटकमा, डाउनलोड गरिएको एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nयसलाई बदलेर <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> बनाउँदा तपाईंको <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> को सेवा रद्द हुँदैन।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक पटकमा एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nSIM बदल्दा तपाईंको <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> को सेवा रद्द हुने छैन।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पार्नुहोस्"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्कमा जोडिँदै…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पारिँदै"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"सेवा प्रदायक बदल्न सकिएन"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"कुनै त्रुटि भएकाले यो सेवा प्रदायक बदल्न सकिएन।"</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अफ गर्ने हो?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM अफ गर्ने हो?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM अफ गरिँदै<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"मोबाइल नेटवर्क अफ गर्न सकिएन"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"केही चिज गडबड भयो र तपाईंको मोबाइल सेवा प्रदायक असक्षम पार्न सकिएन।"</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"दुईवटै SIM प्रयोग गर्ने हो?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"यो यन्त्रमा एकैसाथ २ वटा SIM सक्रिय गर्न सकिन्छ। एक पटकमा एउटा मात्र SIM प्रयोग गर्ने क्रम जारी राख्न \"पर्दैन, धन्यवाद\" मा ट्याप गर्नुहोस्।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"यन्त्र रिस्टार्ट गर्ने हो?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"सुरु गर्न आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्। त्यसपछि तपाईं अर्को SIM हाल्न सक्नुहुन्छ।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"जारी राख्नुहोस्"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"रिस्टार्ट गर्नुहोस्"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"पर्दैन, धन्यवाद"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"बदल्नुहोस्"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM सक्रिय गर्न सकिएन"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM बाहिर झिकेर फेरि हाल्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"फेरि SIM सक्रिय गरी हेर्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"डाउनलोड गरिएको यो SIM मेटाउने हो?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"तपाईंले यो SIM मेटाउनुभयो भने यस यन्त्रबाट <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> सेवा हटाइने छ।\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> को सेवा भने रद्द गरिने छैन।"</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"मेट्नुहोस्"</string>
@@ -5039,16 +5013,11 @@
     <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लुटुथ अन हुने छ"</string>
     <string name="bluetooth_setting_on" msgid="4808458394436224124">"अन"</string>
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"अफ"</string>
-    <!-- no translation found for provider_internet_settings (3831259474776313323) -->
-    <skip />
-    <!-- no translation found for provider_network_settings_title (2624756136016346774) -->
-    <skip />
-    <!-- no translation found for airplane_safe_networks (8689587134664565669) -->
-    <skip />
-    <!-- no translation found for airplane_safe_networks_summary (8352420324632195912) -->
-    <skip />
-    <!-- no translation found for keywords_airplane_safe_networks (5902708537892978245) -->
-    <skip />
+    <string name="provider_internet_settings" msgid="3831259474776313323">"इन्टरनेट"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"हवाइजहाजका सुरक्षित नेटवर्कहरू"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"हवाइजहाजका सुरक्षित नेटवर्कहरू फेला पार्नुहोस् र तिनमा कनेक्ट गर्नुहोस्"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाइजहाज, हवाइजहाजका सुरक्षित नेटवर्क"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"कल तथा SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi कलिङ"</string>
     <string name="calls_sms_wfc_summary" msgid="7604492006688628039">"Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्नुहोस् र कल प्राप्त गर्नुहोस्"</string>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7af51d6..1530dee 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -4847,58 +4847,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହୋଇଥିବା ସମୟରେ ଉପଲବ୍ଧ ନଥାଏ"</string>
     <string name="see_more" msgid="7499355691042812723">"ଅଧିକ ଦେଖନ୍ତୁ"</string>
     <string name="see_less" msgid="2642392725363552793">"କମ୍ ଦେଖନ୍ତୁ"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ଚାଲୁ କରିବେ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMକୁ ଚାଲୁ କରିବେ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବେ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM କାର୍ଡ ବ୍ୟବହାର କରିବାକୁ ସ୍ୱିଚ୍ କରିବେ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ଥରକେ କେବଳ ଗୋଟିଏ SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ଥରକେ କେବଳ ଗୋଟିଏ ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ଥରକେ କେବଳ ଗୋଟିଏ SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\nସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ନେଟୱାର୍କ ସହ ସଂଯୋଗ କରାଯାଉଛି…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରାଯାଉଛି"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ଏକ ତ୍ରୁଟି ଯୋଗୁଁ କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇପାରିବ ନାହିଁ।"</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ବନ୍ଦ କରିବେ?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ବନ୍ଦ କରିବେ?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ବନ୍ଦ କରାଯାଉଛି<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"କ୍ୟାରିଅରକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"କିଛି ତ୍ରୁଟି ହୋଇଥିବାରୁ ଆପଣଙ୍କ ମୋବାଇଲ କମ୍ପାନୀକୁ ଅକ୍ଷମ କରାଯାଇପାରିଲା ନାହିଁ।"</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2ଟି SIM ବ୍ୟବହାର କରିବେ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ଏହି ଡିଭାଇସରେ ଏକ ସମୟରେ 2ଟି SIM ସକ୍ରିୟ ରହିପାରିବ। ଥରକେ 1ଟି SIM ବ୍ୟବହାର କରିବା ଜାରି ରଖିବାକୁ, \"ନା, ଧନ୍ୟବାଦ\"ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରିବେ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ଆରମ୍ଭ କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ। ତା\'ପରେ ଆପଣ ଅନ୍ୟ ଏକ SIM ଯୋଗ କରିପାରିବେ।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ଜାରି ରଖନ୍ତୁ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ନା, ଧନ୍ୟବାଦ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMକୁ କାଢ଼ି ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMକୁ ପୁଣି ଚାଲୁ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଏହି SIMକୁ ଖାଲି କରିବେ?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"ଏହି SIMକୁ ଖାଲି କରିବା ଦ୍ୱାରା, ଏହି ଡିଭାଇସରୁ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ସେବାକୁ କାଢ଼ି ଦିଆଯିବ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ପାଇଁ ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ଖାଲି କରନ୍ତୁ"</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 79113b4..63b9967 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -4847,58 +4847,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="see_more" msgid="7499355691042812723">"ਹੋਰ ਦੇਖੋ"</string>
     <string name="see_less" msgid="2642392725363552793">"ਘੱਟ ਵੇਖੋ"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ਕੀ ਸਿਮ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ਕੀ ਤੁਸੀਂ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ਕੀ ਸਿਮ ਕਾਰਡ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਡਾਊਨਲੋਡ ਕੀਤਾ ਸਿਮ ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਸਕਦਾ ਹੈ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ਕੈਰੀਅਰ ਨੂੰ ਸਵਿੱਚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ਕਿਸੇ ਗੜਬੜ ਕਰਕੇ ਕੈਰੀਅਰ ਨੂੰ ਸਵਿੱਚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ਕੀ ਸਿਮ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ਸਿਮ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ਕੀ 2 ਸਿਮ ਵਰਤਣੇ ਹਨ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਇੱਕੋ ਵੇਲੇ 2 ਸਿਮ ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਸਕਦੇ ਹਨ। ਇੱਕੋ ਵੇਲੇ 1 ਸਿਮ ਵਰਤਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ \"ਨਹੀਂ ਧੰਨਵਾਦ\" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ਕੀ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ। ਫਿਰ ਤੁਸੀਂ ਕੋਈ ਹੋਰ ਸਿਮ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ਸਿਮ ਹਟਾ ਕੇ ਦੁਬਾਰਾ ਪਾਓ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ਸਿਮ ਨੂੰ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"ਕੀ ਇਹ ਡਾਊਨਲੋਡ ਕੀਤਾ ਸਿਮ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"ਇਹ ਸਿਮ ਮਿਟਾਉਣ ਨਾਲ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ਸੇਵਾ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟ ਜਾਂਦੀ ਹੈ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ਲਈ ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ।"</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ਮਿਟਾਓ"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a5ebebb..ab01a08 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -3667,7 +3667,7 @@
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Wyświetlają się u góry sekcji rozmów jako pływające dymki"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Wyświetlają się u góry sekcji rozmów"</string>
     <string name="other_conversations" msgid="551178916855139870">"Rozmowy inne niż priorytetowe"</string>
-    <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy, w których wprowadzono zmiany"</string>
+    <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy z Twoimi zmianami"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Ostatnie rozmowy"</string>
     <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Wyczyść ostatnie"</string>
     <string name="clear" msgid="5092178335409471100">"Wyczyść"</string>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 2c90bad..aea7b51c 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -1837,7 +1837,7 @@
     <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"అన్‌లాక్ నమూనాను మార్చు"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"అన్‌లాక్ పిన్‌ను మార్చండి"</string>
     <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"అన్‌లాక్ ఆకృతిని గీయండి"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"సహాయం కోసం మెను నొక్కండి."</string>
+    <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"సహాయం కోసం మెనూ నొక్కండి."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"పూర్తయినప్పుడు వేలును తీసివేయండి"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"కనీసం <xliff:g id="NUMBER">%d</xliff:g> చుక్కలను కలపండి. మళ్లీ ప్రయత్నించండి."</string>
     <string name="lockpattern_pattern_entered_header" msgid="7709618312713127249">"ఆకృతి రికార్డ్ చేయబడింది"</string>
@@ -4849,58 +4849,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>కి కనెక్ట్ చేసినప్పుడు అందుబాటులో ఉండదు"</string>
     <string name="see_more" msgid="7499355691042812723">"మరిన్నింటిని చూడండి"</string>
     <string name="see_less" msgid="2642392725363552793">"తక్కువ చూడండి"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆన్ చేయాలా?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMను ఆన్ చేయాలా?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వాలా?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"సిమ్ కార్డ్‌ను ఉపయోగించడానికి స్విచ్ చేయాలనుకుంటున్నారా?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ఒకసారి ఒక డౌన్‌లోడ్ చేయబడిన SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\nస్విచ్ అవ్వడం వలన మీ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వండి"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"నెట్‌వర్క్‌కు కనెక్ట్ చేస్తోంది…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవుతోంది"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"క్యారియర్‌ను స్విచ్ చేయడం సాధ్యం కాదు"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ఎర్రర్ కారణంగా క్యారియర్‌ను స్విచ్ చేయడం సాధ్యం కాదు."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆఫ్ చేయాలా?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"సిమ్‌ను ఆఫ్ చేయాలా?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"సిమ్‌ను ఆఫ్ చేస్తోంది<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"క్యారియర్‌ను డిజేబుల్ చేయడం సాధ్యం కాదు"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ఏదో తప్పు జరిగింది, మీ క్యారియర్‌ను డిజేబుల్ చేయడం సాధ్యం కాలేదు."</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIMలు ఉపయోగిస్తారా?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ఈ పరికరంలో ఒకే సమయంలో 2 SIMలు యాక్టివ్‌గా ఉండే సౌకర్యం ఉంది. ఒక సమయంలో ఒక్క SIMనే ఉపయోగించాలనుకుంటే, \"వద్దు, ధన్యవాదాలు\"ను ట్యాప్ చేయండి."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"పరికరాన్ని రీస్టార్ట్ చేయాలా?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ఈ మోడ్‌ను ప్రారంభించడానికి, మీ పరికరాన్ని రీస్టార్ట్ చేయండి. ఆపై, మీరు మరొక SIMను జోడించవచ్చు."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"కొనసాగించు"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"రీస్టార్ట్ చేయి"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"వద్దు, ధన్యవాదాలు"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"స్విచ్ చేయి"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMను యాక్టివేట్ చేయడం సాధ్యం కాదు"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMను తీసివేసి, తిరిగి ఇన్‌సర్ట్ చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMను తిరిగి ఆన్ చేయడానికి ట్రై చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"డౌన్‌లోడ్ చేయబడిన ఈ SIMను తొలగించాలా?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"ఈ SIMను తొలగించడం వలన ఈ పరికరం నుండి <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> సర్వీస్ తీసివేయబడుతోంది.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"తొలగించు"</string>
@@ -4999,7 +4975,7 @@
     <string name="cards_passes_sentence" msgid="1866311782387946944">"కార్డ్‌లు &amp; పాస్‌లు"</string>
     <string name="cards_passes_lower" msgid="2429722007109957877">"కార్డ్‌లు &amp; పాస్‌లు"</string>
     <string name="power_menu_setting_name" msgid="7843519296976254765">"పవర్ మెనూ"</string>
-    <string name="power_menu_setting_title" msgid="7716546106215378956">"పవర్ బటన్ మెను"</string>
+    <string name="power_menu_setting_title" msgid="7716546106215378956">"పవర్ బటన్ మెనూ"</string>
     <string name="power_menu_cards_passes" msgid="1707852019651773645">"కార్డ్‌లు &amp; పాస్‌లు చూపించు"</string>
     <string name="power_menu_device_controls" msgid="5114816270328063924">"పరికరం నియంత్రణలను చూపించు"</string>
     <string name="power_menu_cards_passes_device_controls" msgid="8645794247280620106">"కార్డ్‌లు, పాస్‌లు, పరికరం నియంత్రణలను చూపించు"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 65a4026..e4bd87d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -5013,12 +5013,12 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Увімкнути SIM-карту?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Вибрати оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Вибрати SIM-карту?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Активною може бути лише одна завантажена SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете іншого оператора, сервіс <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> не буде скасовано."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс оператора <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Активною може бути лише одна завантажена SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс оператора <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете іншого оператора, сервіс оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> не буде скасовано."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Вибрати оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Підключення до мережі…"</string>
-    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Триває перехід до оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Активується сервіс оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не вдається змінити оператора"</string>
     <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не вдалося змінити оператора через помилку."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Вимкнути оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index ac8ee65..51cad71 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -4847,58 +4847,34 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> سے منسلک ہونے پر دستیاب نہیں ہے"</string>
     <string name="see_more" msgid="7499355691042812723">"مزید دیکھیں"</string>
     <string name="see_less" msgid="2642392725363552793">"کم دیکھیں"</string>
-    <!-- no translation found for sim_action_enable_sub_dialog_title (4003377033815971802) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sub_dialog_title_without_carrier_name (4842051610633654278) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_title (9180969453358718635) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_psim_dialog_title (5613177333235213024) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text (2091834911153293004) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_downloaded (1396320209544698027) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_text_single_sim (6188750682431170845) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_confirm (1901181581944638961) -->
-    <skip />
-    <!-- no translation found for sim_action_enabling_sim_without_carrier_name (2706862823501979981) -->
-    <skip />
-    <!-- no translation found for sim_action_switch_sub_dialog_progress (8341013572582875574) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_title (1765646238941015899) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_sim_fail_text (4781863235721417544) -->
-    <skip />
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آن کریں؟"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"‏SIM آن کریں؟"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ کریں؟"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"‏SIM کارڈ استعمال کرنے کے لیے سوئچ کریں؟"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"‏ایک وقت میں صرف ایک SIM فعال ہو سکتا ہے۔\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> پر سوئچ کرنا آپ کے <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> کی سروس کو منسوخ نہیں کرے گا۔"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‏ایک وقت میں صرف ایک ڈاؤن لوڈ کردہ SIM فعال ہو سکتا ہے۔\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> پر سوئچ کرنا آپ کے <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> کی سروس کو منسوخ نہیں کرے گا۔"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"‏ایک وقت میں صرف ایک SIM فعال ہو سکتا ہے۔\n\nسوئچ کرنے سے آپ کے <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> کی سروس منسوخ نہیں ہوگی۔"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ کریں"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"نیٹ ورک سے منسلک ہو رہا ہے…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ ہو رہا ہے"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"کیریئر کو سوئچ نہیں کیا جا سکتا"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ایک خرابی کی وجہ سے کیریئر کو سوئچ نہیں کیا جا سکتا۔"</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آف کریں؟"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏SIM آف کریں؟"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏<xliff:g id="ELLIPSIS">…</xliff:g>SIM کو آف کیا جا رہا ہے"</string>
-    <!-- no translation found for privileged_action_disable_fail_title (6689494935697043555) -->
-    <skip />
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"کیریئر کو غیر فعال نہیں کیا جا سکتا"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"کچھ غلط ہوگیا اور آپ کے کیریئر کو غیر فعال نہیں کیا سکا۔"</string>
-    <!-- no translation found for sim_action_enable_dsds_title (226508711751577169) -->
-    <skip />
-    <!-- no translation found for sim_action_enable_dsds_text (970986559326263949) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_title (7054617569121993825) -->
-    <skip />
-    <!-- no translation found for sim_action_restart_text (8019300474703571013) -->
-    <skip />
-    <!-- no translation found for sim_action_continue (1688813133152389943) -->
-    <skip />
-    <!-- no translation found for sim_action_reboot (3508948833333441538) -->
-    <skip />
-    <!-- no translation found for sim_action_no_thanks (435717748384544195) -->
-    <skip />
-    <!-- no translation found for sim_switch_button (1405772571706095387) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_title (4467364110584914794) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg1 (6303921196869256391) -->
-    <skip />
-    <!-- no translation found for dsds_activation_failure_body_msg2 (73044349546544410) -->
-    <skip />
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"‏2 SIMs استعمال کریں؟"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"‏اس آلے میں ایک ہی وقت میں 2 فعال SIMs ہو سکتے ہے۔ ایک وقت میں 1 SIM کے استعمال کو جاری رکھنے کے لیے \"نہیں شکریہ\" پر تھپتھپائیں۔"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"آلہ ری اسٹارٹ کریں؟"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"‏شروع کرنے کے لیے اپنے آلے کو ری اسٹارٹ کریں۔ اس کے بعد آپ دوسرا SIM شامل کر سکتے ہیں۔"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"جاری رکھیں"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ری سٹارٹ کریں"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"نہیں شکریہ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"سوئچ کریں"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏SIM کو فعال نہیں کیا جا سکتا"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏SIM نکال کر دوبارہ داخل کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏SIM کو دوبارہ آن کرنے کی کوشش کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"‏ڈاؤن لوڈ کردہ اس SIM کو مٹائیں؟"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"‏اس SIM کو مٹانے سے اس آلہ سے <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> سروس ہٹ جاتی ہے۔\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> کی سروس منسوخ نہیں ہوگی۔"</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"مٹائیں"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index f4ee146..d9f10b1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -3579,7 +3579,7 @@
     <string name="other_conversations" msgid="551178916855139870">"非优先对话"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"您已更改的对话"</string>
     <string name="recent_conversations" msgid="471678228756995274">"近期对话"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的项目"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除近期项"</string>
     <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"以对话泡形式显示优先对话"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"优先对话会显示在下拉通知栏顶部。您也可将优先对话设置为以对话泡形式显示，并允许系统在“勿扰”模式下显示此类对话泡。"</string>

diff --git a/res/xml/emergency_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml
index bc07366..b1e77c2 100644
--- a/res/xml/emergency_gesture_settings.xml
+++ b/res/xml/emergency_gesture_settings.xml

@@ -25,14 +25,11 @@
         app:animation="@raw/gesture_double_tap"
         app:preview="@drawable/gesture_double_tap"/>
 
-    <SwitchPreference
-        android:key="gesture_emergency_button"
-        android:title="@string/emergency_gesture_screen_title"
-        android:summary="@string/emergency_gesture_screen_summary"
-        android:icon="@drawable/ic_hand_gesture"
-        app:keywords="@string/keywords_gesture"
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="gesture_emergency_button_switch_bar"
+        android:layout="@layout/emergency_gesture_switch_bar"
         app:controller="com.android.settings.gestures.EmergencyGesturePreferenceController"
-        app:allowDividerAbove="true"/>
+        app:allowDividerBelow="true"/>
 
     <SwitchPreference
         android:key="emergency_gesture_sound"

diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 2f38d91..32dad20 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml

@@ -24,7 +24,7 @@
         android:key="gesture_emergency_summary"
         android:title="@string/emergency_gesture_screen_title"
         android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
-        settings:controller="com.android.settings.gestures.EmergencyGesturePreferenceController" />
+        settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
 
     <Preference
         android:key="gesture_assist_input_summary"

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f9359a2..b6a9f59 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java

@@ -83,6 +83,7 @@
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 import android.util.ArraySet;
+import android.util.FeatureFlagUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -1146,4 +1147,9 @@
         drawable.draw(canvas);
         return roundedBitmap;
     }
+
+    public static boolean isProviderModelEnabled(Context context) {
+        return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
+    }
+
 }

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index e3f217d..10409fc 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

@@ -140,7 +140,7 @@
 
     private SubscriptionInfo mSubscriptionInfo;
     private TelephonyDisplayInfo mTelephonyDisplayInfo;
-    private ServiceState mServiceState;
+    private ServiceState mPreviousServiceState;
 
     private final int mSlotIndex;
     private TelephonyManager mTelephonyManager;
@@ -438,7 +438,7 @@
         final int state = Utils.getCombinedServiceState(serviceState);
         if (!Utils.isInService(serviceState)) {
             resetSignalStrength();
-        } else if (mServiceState != null && !Utils.isInService(mServiceState)) {
+        } else if (!Utils.isInService(mPreviousServiceState)) {
             // If ServiceState changed from out of service -> in service, update signal strength.
             updateSignalStrength(mTelephonyManager.getSignalStrength());
         }
@@ -771,7 +771,7 @@
                 updateNetworkProvider();
                 updateServiceState(serviceState);
                 updateRoamingStatus(serviceState);
-                mServiceState = serviceState;
+                mPreviousServiceState = serviceState;
             }
 
             @Override

diff --git a/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
new file mode 100644
index 0000000..278fa3a
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java

@@ -0,0 +1,125 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for emergency gesture setting's entyrpoint preference
+ */
+public class EmergencyGestureEntrypointPreferenceController extends BasePreferenceController {
+    private static final String TAG = "EmergencyGestureEntry";
+
+    @VisibleForTesting
+    static final String ACTION_EMERGENCY_GESTURE_SETTINGS =
+            "com.android.settings.action.emergency_gesture_settings";
+    @VisibleForTesting
+    Intent mIntent;
+
+    private boolean mUseCustomIntent;
+
+    public EmergencyGestureEntrypointPreferenceController(Context context, String key) {
+        super(context, key);
+        final String emergencyGestureSettingsPackageName = context.getResources().getString(
+                R.string.emergency_gesture_settings_package);
+        if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
+            mUseCustomIntent = true;
+            // Use custom intent if it's configured and system can resolve it.
+            final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
+                    .setPackage(emergencyGestureSettingsPackageName);
+            if (canResolveIntent(intent)) {
+                mIntent = intent;
+            }
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final boolean canHandleClicks = !mUseCustomIntent || mIntent != null;
+        if (preference != null) {
+            preference.setEnabled(canHandleClicks);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mIntent != null) {
+            mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            mContext.startActivity(mIntent);
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        final boolean isConfigEnabled = mContext.getResources()
+                .getBoolean(R.bool.config_show_emergency_gesture_settings);
+
+        if (!isConfigEnabled) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mUseCustomIntent) {
+            final String packageName = mContext.getResources().getString(
+                    R.string.emergency_gesture_settings_package);
+            try {
+                final PackageManager pm = mContext.getPackageManager();
+                final ApplicationInfo appInfo = pm.getApplicationInfo(
+                        packageName, PackageManager.MATCH_DISABLED_COMPONENTS
+                                | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);
+                return mContext.getString(R.string.emergency_gesture_entrypoint_summary,
+                        appInfo.loadLabel(pm));
+            } catch (Exception e) {
+                Log.d(TAG, "Failed to get custom summary, falling back.");
+                return super.getSummary();
+            }
+        }
+
+        return super.getSummary();
+    }
+
+    /**
+     * Whether or not gesture page content should be suppressed from search.
+     */
+    public boolean shouldSuppressFromSearch() {
+        return mUseCustomIntent;
+    }
+
+    private boolean canResolveIntent(Intent intent) {
+        final ResolveInfo resolveActivity = mContext.getPackageManager()
+                .resolveActivity(intent, 0);
+        return resolveActivity != null;
+    }
+}

diff --git a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java b/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
index c8ce494..2a393a4 100644
--- a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java

@@ -17,64 +17,34 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
+import android.widget.Switch;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.widget.LayoutPreference;
 
 /**
  * Preference controller for emergency gesture setting
  */
-public class EmergencyGesturePreferenceController extends GesturePreferenceController {
-    private static final String TAG = "EmergencyGesturePref";
+public class EmergencyGesturePreferenceController extends BasePreferenceController implements
+        SwitchBar.OnSwitchChangeListener {
 
     @VisibleForTesting
     static final int ON = 1;
     @VisibleForTesting
     static final int OFF = 0;
-    @VisibleForTesting
-    static final String ACTION_EMERGENCY_GESTURE_SETTINGS =
-            "com.android.settings.action.emergency_gesture_settings";
-    @VisibleForTesting
-    Intent mIntent;
-
-    private boolean mUseCustomIntent;
-
-    private static final String PREF_KEY_VIDEO = "emergency_gesture_screen_video";
 
     private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
 
+    private SwitchBar mSwitchBar;
+
     public EmergencyGesturePreferenceController(Context context, String key) {
         super(context, key);
-        final String emergencyGestureSettingsPackageName = context.getResources().getString(
-                R.string.emergency_gesture_settings_package);
-        if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
-            mUseCustomIntent = true;
-            // Use custom intent if it's configured and system can resolve it.
-            final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
-                    .setPackage(emergencyGestureSettingsPackageName);
-            if (canResolveIntent(intent)) {
-                mIntent = intent;
-            }
-        }
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mIntent != null) {
-            mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            mContext.startActivity(mIntent);
-            return true;
-        }
-        return super.handlePreferenceTreeClick(preference);
     }
 
     @Override
@@ -89,62 +59,24 @@
     }
 
     @Override
-    public boolean isSliceable() {
-        return TextUtils.equals(getPreferenceKey(), "gesture_emergency_button");
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final LayoutPreference pref = screen.findPreference(mPreferenceKey);
+        mSwitchBar = pref.findViewById(R.id.switch_bar);
+        mSwitchBar.setSwitchBarText(R.string.emergency_gesture_screen_title,
+                R.string.emergency_gesture_screen_title);
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.setChecked(isChecked());
+        mSwitchBar.show();
     }
 
-    @Override
-    protected boolean canHandleClicks() {
-        return !mUseCustomIntent || mIntent != null;
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        if (mUseCustomIntent) {
-            final String packageName = mContext.getResources().getString(
-                    R.string.emergency_gesture_settings_package);
-            try {
-                final PackageManager pm = mContext.getPackageManager();
-                final ApplicationInfo appInfo = pm.getApplicationInfo(
-                        packageName, PackageManager.MATCH_DISABLED_COMPONENTS
-                                | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);
-                return mContext.getString(R.string.emergency_gesture_entrypoint_summary,
-                        appInfo.loadLabel(pm));
-            } catch (Exception e) {
-                Log.d(TAG, "Failed to get custom summary, falling back.");
-                return super.getSummary();
-            }
-        }
-
-        return super.getSummary();
-    }
-
-    @Override
-    protected String getVideoPrefKey() {
-        return PREF_KEY_VIDEO;
-    }
-
-    @Override
+    @VisibleForTesting
     public boolean isChecked() {
         return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
     }
 
     @Override
-    public boolean setChecked(boolean isChecked) {
-        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
-                isChecked ? ON : OFF);
-    }
-
-    /**
-     * Whether or not gesture page content should be suppressed from search.
-     */
-    public boolean shouldSuppressFromSearch() {
-        return mUseCustomIntent;
-    }
-
-    private boolean canResolveIntent(Intent intent) {
-        final ResolveInfo resolveActivity = mContext.getPackageManager()
-                .resolveActivity(intent, 0);
-        return resolveActivity != null;
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, isChecked ? ON : OFF);
     }
 }

diff --git a/src/com/android/settings/gestures/EmergencyGestureSettings.java b/src/com/android/settings/gestures/EmergencyGestureSettings.java
index 19ba690..5eec21c 100644
--- a/src/com/android/settings/gestures/EmergencyGestureSettings.java
+++ b/src/com/android/settings/gestures/EmergencyGestureSettings.java

@@ -51,8 +51,8 @@
             new BaseSearchIndexProvider(R.xml.emergency_gesture_settings) {
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
-                    final EmergencyGesturePreferenceController controller =
-                            new EmergencyGesturePreferenceController(context,
+                    final EmergencyGestureEntrypointPreferenceController controller =
+                            new EmergencyGestureEntrypointPreferenceController(context,
                                     "dummy_emergency_gesture_pref_key");
                     return !controller.isAvailable()
                             || controller.shouldSuppressFromSearch();

diff --git a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
index 43eed0c..1a68ade 100644
--- a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
+++ b/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java

@@ -22,12 +22,11 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
 
 /**
  * Preference controller for emergency sos gesture setting
  */
-public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
+public class EmergencyGestureSoundPreferenceController extends GesturePreferenceController {
 
     @VisibleForTesting
     static final int ON = 1;
@@ -40,6 +39,11 @@
         super(context, key);
     }
 
+    @Override
+    protected String getVideoPrefKey() {
+        return "emergency_gesture_screen_video";
+    }
+
     private static boolean isGestureAvailable(Context context) {
         return context.getResources()
                 .getBoolean(R.bool.config_show_emergency_gesture_settings);

diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index 82df4aa..53d6c30 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java

@@ -24,9 +24,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
 import android.provider.Settings;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
@@ -71,7 +68,6 @@
     private String mPreferenceGroupKey;
     private PreferenceGroup mPreferenceGroup;
     private SubscriptionManager mManager;
-    private ConnectivityManager mConnectivityManager;
     private SubscriptionsChangeListener mSubscriptionsListener;
     private MobileDataEnabledListener mDataEnabledListener;
     private DataConnectivityListener mConnectivityListener;
@@ -112,7 +108,6 @@
         mPreferenceGroupKey = preferenceGroupKey;
         mStartOrder = startOrder;
         mManager = context.getSystemService(SubscriptionManager.class);
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
         mSubscriptionPreferences = new ArrayMap<>();
         mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
         mDataEnabledListener = new MobileDataEnabledListener(context, this);
@@ -229,19 +224,6 @@
                 NO_CELL_DATA_TYPE_ICON, cutOut);
     }
 
-    private boolean activeNetworkIsCellular() {
-        final Network activeNetwork = mConnectivityManager.getActiveNetwork();
-        if (activeNetwork == null) {
-            return false;
-        }
-        final NetworkCapabilities networkCapabilities = mConnectivityManager.getNetworkCapabilities(
-                activeNetwork);
-        if (networkCapabilities == null) {
-            return false;
-        }
-        return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
-    }
-
     /**
      * The summary can have either 1 or 2 lines depending on which services (calls, SMS, data) this
      * subscription is the default for.
@@ -271,7 +253,7 @@
             final TelephonyManager telMgrForSub = mContext.getSystemService(
                     TelephonyManager.class).createForSubscriptionId(subId);
             final boolean dataEnabled = telMgrForSub.isDataEnabled();
-            if (dataEnabled && activeNetworkIsCellular()) {
+            if (dataEnabled && MobileNetworkUtils.activeNetworkIsCellular(mContext)) {
                 line2 = mContext.getString(R.string.mobile_data_active);
             } else if (!dataEnabled) {
                 line2 = mContext.getString(R.string.mobile_data_off);

diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 99e69c7..b300c66 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java

@@ -31,6 +31,7 @@
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
 
+import android.annotation.Nullable;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -41,6 +42,9 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.PersistableBundle;
 import android.os.SystemClock;
 import android.os.SystemProperties;
@@ -69,6 +73,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.settingslib.graph.SignalDrawable;
@@ -202,8 +207,7 @@
         return bundle.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
     }
 
-    @VisibleForTesting
-    static Intent buildPhoneAccountConfigureIntent(
+    public static Intent buildPhoneAccountConfigureIntent(
             Context context, PhoneAccountHandle accountHandle) {
         Intent intent = buildConfigureIntent(
                 context, accountHandle, TelecomManager.ACTION_CONFIGURE_PHONE_ACCOUNT);
@@ -854,4 +858,45 @@
         raf = ((NR & raf) > 0) ? (NR | raf) : raf;
         return raf;
     }
+
+    /**
+     * Copied from SubscriptionsPreferenceController#activeNetworkIsCellular()
+     */
+    public static boolean activeNetworkIsCellular(Context context) {
+        final ConnectivityManager connectivityManager =
+                context.getSystemService(ConnectivityManager.class);
+        final Network activeNetwork = connectivityManager.getActiveNetwork();
+        if (activeNetwork == null) {
+            return false;
+        }
+        final NetworkCapabilities networkCapabilities =
+                connectivityManager.getNetworkCapabilities(activeNetwork);
+        if (networkCapabilities == null) {
+            return false;
+        }
+        return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+    }
+
+    /**
+     * Copied from WifiCallingPreferenceController#isWifiCallingEnabled()
+     */
+    public static boolean isWifiCallingEnabled(Context context, int subId,
+            @Nullable WifiCallingQueryImsState queryImsState,
+            @Nullable PhoneAccountHandle phoneAccountHandle) {
+        if (phoneAccountHandle == null){
+            phoneAccountHandle = context.getSystemService(TelecomManager.class)
+                    .getSimCallManagerForSubscription(subId);
+        }
+        boolean isWifiCallingEnabled;
+        if (phoneAccountHandle != null) {
+            final Intent intent = buildPhoneAccountConfigureIntent(context, phoneAccountHandle);
+            isWifiCallingEnabled = intent != null;
+        } else {
+            if (queryImsState == null) {
+                queryImsState = new WifiCallingQueryImsState(context, subId);
+            }
+            isWifiCallingEnabled = queryImsState.isReadyToWifiCalling();
+        }
+        return isWifiCallingEnabled;
+    }
 }

diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index b38fe07..6bfd650 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java

@@ -71,7 +71,7 @@
     @Override
     public int getAvailabilityStatus(int subId) {
         return SubscriptionManager.isValidSubscriptionId(subId)
-                && isWifiCallingEnabled(mContext, subId)
+                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null, null)
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
@@ -221,23 +221,4 @@
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
         }
     }
-
-    private boolean isWifiCallingEnabled(Context context, int subId) {
-        final PhoneAccountHandle simCallManager =
-                context.getSystemService(TelecomManager.class)
-                       .getSimCallManagerForSubscription(subId);
-        final int phoneId = SubscriptionManager.getSlotIndex(subId);
-
-        boolean isWifiCallingEnabled;
-        if (simCallManager != null) {
-            final Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(
-                    context, simCallManager);
-
-            isWifiCallingEnabled = intent != null;
-        } else {
-            isWifiCallingEnabled = queryImsState(subId).isReadyToWifiCalling();
-        }
-
-        return isWifiCallingEnabled;
-    }
 }

diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index bbab259..a854c04 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

@@ -42,6 +42,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -293,7 +294,7 @@
 
         final String signalStrengthString =
                 mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
     }
 
     @Test
@@ -310,7 +311,7 @@
 
         final String signalStrengthString =
                 mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
     }
 
     @Test
@@ -330,7 +331,7 @@
 
         final String signalStrengthString =
                 mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
     }
 
     @Test
@@ -394,8 +395,8 @@
 
         mController.initialize();
 
-        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
+        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
+        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
     }
 
     @Test
@@ -405,7 +406,7 @@
 
         mController.initialize();
 
-        verify(mDialog).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
+        verify(mDialog, times(2)).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
         verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
         verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
     }

diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
new file mode 100644
index 0000000..e62de08
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java

@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ResolveInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class EmergencyGestureEntrypointPreferenceControllerTest {
+
+    private static final String TEST_PKG_NAME = "test_pkg";
+    private static final String TEST_CLASS_NAME = "name";
+    private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
+            .setPackage(TEST_PKG_NAME);
+
+    private Context mContext;
+    private ShadowPackageManager mPackageManager;
+    private EmergencyGestureEntrypointPreferenceController mController;
+    private static final String PREF_KEY = "gesture_emergency_button";
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void constructor_hasCustomPackageConfig_shouldSetIntent() {
+        final ResolveInfo info = new ResolveInfo();
+        info.activityInfo = new ActivityInfo();
+        info.activityInfo.packageName = TEST_PKG_NAME;
+        info.activityInfo.name = TEST_CLASS_NAME;
+
+        mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
+
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        SettingsShadowResources.overrideResource(
+                R.string.emergency_gesture_settings_package,
+                TEST_PKG_NAME);
+
+        mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.mIntent).isNotNull();
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
index f894394..08106d3 100644
--- a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java

@@ -16,7 +16,8 @@
 
 package com.android.settings.gestures;
 
-import static com.android.settings.gestures.EmergencyGesturePreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.android.settings.gestures.EmergencyGesturePreferenceController.OFF;
 import static com.android.settings.gestures.EmergencyGesturePreferenceController.ON;
 
@@ -24,9 +25,6 @@
 
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
 import android.provider.Settings;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -39,22 +37,14 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = SettingsShadowResources.class)
 public class EmergencyGesturePreferenceControllerTest {
 
-    private static final String TEST_PKG_NAME = "test_pkg";
-    private static final String TEST_CLASS_NAME = "name";
-    private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
-            .setPackage(TEST_PKG_NAME);
-
     private Context mContext;
     private ContentResolver mContentResolver;
-    private ShadowPackageManager mPackageManager;
     private EmergencyGesturePreferenceController mController;
     private static final String PREF_KEY = "gesture_emergency_button";
 
@@ -62,7 +52,6 @@
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
         mContentResolver = mContext.getContentResolver();
-        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
         mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
     }
 
@@ -72,43 +61,21 @@
     }
 
     @Test
-    public void constructor_hasCustomPackageConfig_shouldSetIntent() {
-        final ResolveInfo info = new ResolveInfo();
-        info.activityInfo = new ActivityInfo();
-        info.activityInfo.packageName = TEST_PKG_NAME;
-        info.activityInfo.name = TEST_CLASS_NAME;
-
-        mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
-
+    public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
         SettingsShadowResources.overrideResource(
                 R.bool.config_show_emergency_gesture_settings,
                 Boolean.TRUE);
 
-        SettingsShadowResources.overrideResource(
-                R.string.emergency_gesture_settings_package,
-                TEST_PKG_NAME);
-
-        mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
-
-        assertThat(mController.mIntent).isNotNull();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
     @Test
-    public void isAvailable_configIsTrue_shouldReturnTrue() {
-        SettingsShadowResources.overrideResource(
-                R.bool.config_show_emergency_gesture_settings,
-                Boolean.TRUE);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_configIsFalse_shouldReturnFalse() {
+    public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
         SettingsShadowResources.overrideResource(
                 R.bool.config_show_emergency_gesture_settings,
                 Boolean.FALSE);
 
-        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
@@ -130,17 +97,7 @@
     }
 
     @Test
-    public void isSliceableCorrectKey_returnsTrue() {
-        final EmergencyGesturePreferenceController controller =
-                new EmergencyGesturePreferenceController(mContext, PREF_KEY);
-        assertThat(controller.isSliceable()).isTrue();
+    public void isSliceable_returnsFalse() {
+        assertThat(mController.isSliceable()).isFalse();
     }
-
-    @Test
-    public void isSliceableIncorrectKey_returnsFalse() {
-        final DoubleTapPowerPreferenceController controller =
-                new DoubleTapPowerPreferenceController(mContext, "bad_key");
-        assertThat(controller.isSliceable()).isFalse();
-    }
-
 }

diff --git a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
index 7938a99..9b38e5b 100644
--- a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java

@@ -19,11 +19,12 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import android.content.res.Resources;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.testutils.ResourcesUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,12 +43,8 @@
     public void testNoProvisionStringFormattedCorrectly() {
         final String operator = "test_operator";
 
-        assertThat(resourceString("mobile_no_provisioning_url", operator))
+        assertThat(
+                ResourcesUtils.getResourcesString(mContext, "mobile_no_provisioning_url", operator))
                 .contains(operator);
     }
-
-    public String resourceString(String name, Object value) {
-        final Resources res = mContext.getResources();
-        return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()), value);
-    }
 }

diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
index 50c27c5..282704d 100644
--- a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java

@@ -40,7 +40,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.testutils.Utils;
+import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.After;
 import org.junit.Before;
@@ -137,7 +137,7 @@
         assertThat(entries[0]).isEqualTo("sub1");
         assertThat(entries[1]).isEqualTo("sub2");
         assertThat(entries[2]).isEqualTo(
-                Utils.getResourceString(mContext, "calls_and_sms_ask_every_time"));
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
 
         final CharSequence[] entryValues = mListPreference.getEntryValues();
         assertThat(entryValues.length).isEqualTo(3);
@@ -166,7 +166,7 @@
         assertThat(entries[0]).isEqualTo("sub1");
         assertThat(entries[1]).isEqualTo("sub2");
         assertThat(entries[2]).isEqualTo(
-                Utils.getResourceString(mContext, "calls_and_sms_ask_every_time"));
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
 
         final CharSequence[] entryValues = mListPreference.getEntryValues();
         assertThat(entryValues.length).isEqualTo(3);
@@ -195,7 +195,7 @@
         assertThat(entries[0]).isEqualTo("sub1");
         assertThat(entries[1]).isEqualTo("sub3");
         assertThat(entries[2]).isEqualTo(
-                Utils.getResourceString(mContext, "calls_and_sms_ask_every_time"));
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
 
         final CharSequence[] entryValues = mListPreference.getEntryValues();
         assertThat(entryValues.length).isEqualTo(3);
@@ -332,7 +332,7 @@
         assertThat(entries[1].toString()).isEqualTo("sub2");
         assertThat(entries[2].toString()).isEqualTo("sub3");
         assertThat(entries[3].toString()).isEqualTo(
-                Utils.getResourceString(mContext, "calls_and_sms_ask_every_time"));
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
         assertThat(entryValues[0].toString()).isEqualTo("111");
         assertThat(entryValues[1].toString()).isEqualTo("222");
         assertThat(entryValues[2].toString()).isEqualTo("333");

diff --git a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
index 95f1ee1..2b812c7 100644
--- a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java

@@ -32,7 +32,6 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.telephony.CarrierConfigManager;
 import android.telephony.ims.ProvisioningManager;
 
@@ -53,6 +52,7 @@
 import com.android.settings.slices.SliceBroadcastReceiver;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -203,7 +203,8 @@
 
         // Check the title
         final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, resourceString("enhanced_4g_lte_mode_title"));
+        assertTitle(sliceItems,
+                ResourcesUtils.getResourcesString(mContext, "enhanced_4g_lte_mode_title"));
     }
 
     private void testEnhanced4gLteSettingsToggleSlice(Slice slice) {
@@ -228,7 +229,8 @@
 
         // Check the title
         final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, resourceString("enhanced_4g_lte_mode_title"));
+        assertTitle(sliceItems,
+                ResourcesUtils.getResourcesString(mContext, "enhanced_4g_lte_mode_title"));
     }
 
     private PendingIntent getBroadcastIntent(String action) {
@@ -287,9 +289,4 @@
             return mQueryImsState;
         }
     }
-
-    public String resourceString(String name) {
-        final Resources res = mContext.getResources();
-        return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()));
-    }
 }

diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index 0feabf2..cf4eb91 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java

@@ -28,7 +28,6 @@
 
 import android.app.Instrumentation;
 import android.content.Context;
-import android.content.res.Resources;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -40,6 +39,8 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.android.settings.testutils.ResourcesUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -169,8 +170,9 @@
         mController.updateState(mPreference);
 
         assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.getSummary())
-                .isEqualTo(resourceString("mobile_data_settings_summary_auto_switch"));
+        assertThat(mPreference.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext,
+                        "mobile_data_settings_summary_auto_switch"));
     }
 
     @Test
@@ -181,12 +183,7 @@
         mController.updateState(mPreference);
 
         assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.getSummary())
-                .isEqualTo(resourceString("mobile_data_settings_summary"));
-    }
-
-    public String resourceString(String name) {
-        final Resources res = mContext.getResources();
-        return res.getString(res.getIdentifier(name, "string", mContext.getPackageName()));
+        assertThat(mPreference.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "mobile_data_settings_summary"));
     }
 }

diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
index ee8157d..9c0a082 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java

@@ -17,10 +17,13 @@
 package com.android.settings.network.telephony;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -31,9 +34,13 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.PersistableBundle;
 import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -42,6 +49,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.network.ims.MockWfcQueryImsState;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 import org.junit.Before;
@@ -79,11 +87,18 @@
     private ResolveInfo mResolveInfo;
     @Mock
     private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelecomManager mTelecomManager;
 
     private Context mContext;
     private PersistableBundle mCarrierConfig;
     private PhoneAccountHandle mPhoneAccountHandle;
     private ComponentName mComponentName;
+    private NetworkCapabilities mNetworkCapabilities;
+    private Network mNetwork;
+    private MockWfcQueryImsState mMockQueryWfcState;
 
     @Before
     public void setUp() {
@@ -92,7 +107,6 @@
         mContext = spy(ApplicationProvider.getApplicationContext());
         when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
         when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
         when(mTelephonyManager.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager);
         when(mTelephonyManager.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
@@ -103,6 +117,10 @@
         mCarrierConfig = new PersistableBundle();
         when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
 
+        mNetwork = new Network(anyInt());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
+
         when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
         when(mSubscriptionInfo1.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_1);
         when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
@@ -115,6 +133,11 @@
 
         when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
                 PLMN_FROM_TELEPHONY_MANAGER_API);
+
+        when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
+        when(mTelecomManager.getSimCallManagerForSubscription(SUB_ID_1))
+                .thenReturn(mPhoneAccountHandle);
+        mMockQueryWfcState = new MockWfcQueryImsState(mContext, SUB_ID_1);
     }
 
     @Test
@@ -148,8 +171,7 @@
 
     @Test
     public void buildConfigureIntent_noActivityHandleIntent_returnNull() {
-        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
-                .thenReturn(new ArrayList<>());
+        buildPhoneAccountConfigureIntent(false);
 
         assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
                 mPhoneAccountHandle)).isNull();
@@ -157,10 +179,7 @@
 
     @Test
     public void buildConfigureIntent_hasActivityHandleIntent_returnIntent() {
-        mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
-        mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
-        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
-                .thenReturn(Arrays.asList(mResolveInfo));
+        buildPhoneAccountConfigureIntent(true);
 
         assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
                 mPhoneAccountHandle)).isNotNull();
@@ -333,4 +352,71 @@
         assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
                 mContext)).isNotNull();
     }
+
+    @Test
+    public void isCellularNetwork_withCellularNetwork_returnTrue() {
+        addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
+
+        assertTrue(MobileNetworkUtils.activeNetworkIsCellular(mContext));
+    }
+
+    @Test
+    public void isCellularNetwork_withWifiNetwork_returnFalse() {
+        addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+
+        assertFalse(MobileNetworkUtils.activeNetworkIsCellular(mContext));
+    }
+
+    private void addNetworkTransportType (int networkType) {
+        mNetworkCapabilities = new NetworkCapabilities().addTransportType(networkType);
+        when(mConnectivityManager.getNetworkCapabilities(mNetwork)).thenReturn(
+                mNetworkCapabilities);
+    }
+
+    @Test
+    public void isWifiCallingEnabled_hasPhoneAccountHandleAndHasActivityHandleIntent_returnTrue() {
+        buildPhoneAccountConfigureIntent(true);
+
+        assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                null, mPhoneAccountHandle));
+    }
+
+    @Test
+    public void isWifiCallingEnabled_hasPhoneAccountHandleAndNoActivityHandleIntent_returnFalse() {
+        buildPhoneAccountConfigureIntent(false);
+
+        assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                null, mPhoneAccountHandle));
+    }
+
+    @Test
+    public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingIsReady_returnTrue() {
+        setWifiCallingEnabled(true);
+
+        assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                mMockQueryWfcState, null));
+    }
+
+    @Test
+    public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingNotReady_returnFalse() {
+        setWifiCallingEnabled(false);
+
+        assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                mMockQueryWfcState, null));
+    }
+
+    private void setWifiCallingEnabled(boolean enabled){
+        mMockQueryWfcState.setIsEnabledByUser(enabled);
+        mMockQueryWfcState.setServiceStateReady(enabled);
+        mMockQueryWfcState.setIsEnabledByPlatform(enabled);
+        mMockQueryWfcState.setIsProvisionedOnDevice(enabled);
+    }
+
+    private void buildPhoneAccountConfigureIntent(boolean hasActivityHandleIntent) {
+        mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
+        mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
+        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+                .thenReturn(
+                        hasActivityHandleIntent ? Arrays.asList(mResolveInfo) : new ArrayList<>());
+    }
 }

diff --git a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
index f975055..c5da3c5 100644
--- a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java

@@ -38,8 +38,8 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.android.settings.R;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.After;
 import org.junit.Before;
@@ -73,7 +73,8 @@
         mContext = spy(ApplicationProvider.getApplicationContext());
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
         when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(mCarrierConfigManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
 
         doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
         doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
@@ -91,7 +92,7 @@
     @After
     public void tearDown() {
         Settings.Global.putInt(
-            mContext.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0);
+                mContext.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0);
     }
 
     @Test
@@ -142,7 +143,8 @@
         assertThat(mPreference.getValue()).isEqualTo(
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
         assertThat(mPreference.getSummary()).isEqualTo(
-                resourceString("preferred_network_mode_tdscdma_gsm_wcdma_summary"));
+                ResourcesUtils.getResourcesString(mContext,
+                        "preferred_network_mode_tdscdma_gsm_wcdma_summary"));
     }
 
     @Test
@@ -161,7 +163,7 @@
     @Test
     public void onPreferenceChange_updateFail() {
         doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-            getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
 
         mController.onPreferenceChange(mPreference,
                 String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
@@ -170,12 +172,4 @@
                 Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
                 TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
     }
-
-    public int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    public String resourceString(String name) {
-        return mContext.getResources().getString(resourceId("string", name));
-    }
 }

diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
index 1364b24..a97be94 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java

@@ -36,6 +36,8 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.testutils.ResourcesUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -128,7 +130,7 @@
 
         assertThat(mSwitchPreference.isEnabled()).isFalse();
         assertThat(mSwitchPreference.getSummary()).isEqualTo(
-            resourceString("manual_mode_disallowed_summary",
+                ResourcesUtils.getResourcesString(mContext, "manual_mode_disallowed_summary",
                 mTelephonyManager.getSimOperatorName()));
     }
 
@@ -139,12 +141,4 @@
         // Should not crash
         mController.init(mLifecycle, SUB_ID);
     }
-
-    public int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    public String resourceString(String name, Object value) {
-        return mContext.getResources().getString(resourceId("string", name), value);
-    }
 }

diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
index c204e0e..0d20140 100644
--- a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java

@@ -34,6 +34,8 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.settings.testutils.ResourcesUtils;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -118,14 +120,7 @@
     public void getSummary_notInService_returnDisconnect() {
         when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
 
-        assertThat(mController.getSummary()).isEqualTo(resourceString("network_disconnected"));
-    }
-
-    public int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    public String resourceString(String name) {
-        return mContext.getResources().getString(resourceId("string", name));
+        assertThat(mController.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "network_disconnected"));
     }
 }

diff --git a/tests/unit/src/com/android/settings/testutils/Utils.java b/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java
similarity index 62%
rename from tests/unit/src/com/android/settings/testutils/Utils.java
rename to tests/unit/src/com/android/settings/testutils/ResourcesUtils.java
index 238dc77..636954d 100644
--- a/tests/unit/src/com/android/settings/testutils/Utils.java
+++ b/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java

@@ -17,12 +17,16 @@
 
 import android.content.Context;
 
-public final class Utils {
-    public static int getResourceId(Context context, String type, String name) {
+public final class ResourcesUtils {
+    public static int getResourcesId(Context context, String type, String name) {
         return context.getResources().getIdentifier(name, type, context.getPackageName());
     }
 
-    public static String getResourceString(Context context, String name) {
-        return context.getResources().getString(getResourceId(context, "string", name));
+    public static String getResourcesString(Context context, String name) {
+        return context.getResources().getString(getResourcesId(context, "string", name));
+    }
+
+    public static String getResourcesString(Context context, String name, Object value) {
+        return context.getResources().getString(getResourcesId(context, "string", name), value);
     }
 }
commit	564eaec28369bf0217739d7ad1d9b9472c2b4c8b	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Mon Nov 16 02:50:12 2020 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Mon Nov 16 02:50:12 2020 +0000
tree	35d7cd647f5bbb0e5f796ddc832d12380a8d7728
parent	baa56fac456ebaee48d9a0e7c8db9fdece7314e0 [diff]
parent	8031c0bbac74d9fcf12391f4b0bb5af7b45878a4 [diff]