Merge "Specify explicitly FLAG_IMMUTABLE for PendingIntent"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97e701a..82088b2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -103,7 +103,7 @@
     <uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM" />
     <uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    
+
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
             android:theme="@style/Theme.Settings"
diff --git a/res/layout/notif_priority_conversation_preference.xml b/res/layout/notif_priority_conversation_preference.xml
index d07bc23..c93abf2 100644
--- a/res/layout/notif_priority_conversation_preference.xml
+++ b/res/layout/notif_priority_conversation_preference.xml
@@ -67,6 +67,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="4"
+            android:layout_below="@id/icon_label_container"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
diff --git a/res/layout/reset_importance_button.xml b/res/layout/reset_importance_button.xml
new file mode 100644
index 0000000..6d023b9
--- /dev/null
+++ b/res/layout/reset_importance_button.xml
@@ -0,0 +1,33 @@
+<?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.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/reset_importance_button"
+        style="@style/ActionPrimaryButton"
+        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:text="@string/asst_importance_reset_title"
+        android:layout_gravity="start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7a30456..703db6a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tik om na tablet te kyk"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tik om na toestel te kyk"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tik op jou skerm om na die horlosie, kennisgewings en ander inligting te kyk."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniekknoppie"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Bestuur deur <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Begin die nood-SOS-handelinge deur die aan/af-skakelaar 5 keer vinnig te druk."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Waarskuwingsgeluid"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Waarsku voordat jy die handelinge begin"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nood-SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Bestuur deur <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Begin die nood-SOS-handelinge deur die aan/af-skakelaar 5 keer vinnig te druk."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Waarskuwingsgeluid"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Waarsku voordat jy die handelinge begin"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swiep vingerafdruk vir kennisgewings"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swiep vingerafdruk"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou foon om jou kennisgewings na te gaan."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c540fff..221a9ac 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ጡባዊ ላይ ምልክት ያድርጉ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"መሣሪያ ላይ ምልክት ያድርጉ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ማያ ገጽ መታ ያድርጉት።"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"የቀውስ አዝራር"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"የሚቀናበረው በ<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"የኃይል አዝራሩን 5 ጊዜ በፍጥነት በመጫን የድንገተኛ አደጋ ኤስኦኤስ እርምጃዎችን ያስጀምሩ።"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"የማስጠንቀቂያ ድምጽ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"እርምጃዎቹን ከመጀመር በፊት ማንቂያ"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"የድንገተኛ አደጋ ኤስኦኤስ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"የሚቀናበረው በ<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"የኃይል አዝራሩን 5 ጊዜ በፍጥነት በመጫን የድንገተኛ አደጋ ኤስኦኤስ እርምጃዎችን ያስጀምሩ።"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"የማስጠንቀቂያ ድምጽ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"እርምጃዎቹን ከመጀመር በፊት ማንቂያ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ማሳወቂያዎችን ለማግኘት የጣት አሻራን ያንሸራትቱ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"የጣት አሻራን ያንሸራቱ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"የእርስዎን ማሳወቂያዎች ለመመልከት በስልክዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e2f8d98..9f94f42 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -4790,11 +4790,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"النقر لفحص الجهاز اللوحي"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"النقر لفحص الجهاز"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر على شاشتك."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"زر الطوارئ"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"تحت إدارة <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"يمكنك بدء إجراءات حالات الطوارئ عن طريق الضغط بسرعة على زر التشغيل 5 مرات."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"صوت تحذير"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"التنبيه قبل بدء الإجراءات"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"‏تنبيه SOS في حالة طوارئ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"تحت إدارة <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"يمكنك بدء إجراءات حالات الطوارئ عن طريق الضغط بسرعة على زر التشغيل 5 مرات."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"صوت تحذير"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"التنبيه قبل بدء الإجراءات"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تمرير بصمة الإصبع لعرض الإشعارات"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تمرير بصمة الإصبع"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"للاطّلاع على الإشعارات، مرِّر إصبعك للأسفل على زر استشعار بصمات الإصبع في الجزء الخلفي لهاتفك."</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0690241..79f6612 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2510,10 +2510,8 @@
       <item quantity="other">%1$d এপক নিষিদ্ধ কৰা হ’ল</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"আপোনাৰ বেটাৰী মিটাৰ পঢ়োঁতে সমস্যা হৈছে"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"আপোনাৰ বেটাৰী মিটাৰ পঢ়োঁতে সমস্যা হৈছে। "<annotation id="url">"অধিক জানিবলৈ"</annotation>" টিপক"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"এপ্ বন্ধ কৰিবনে?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"আপোনাৰ ফ\'নটোৱে স্বাভাৱিকভাৱে বেটাৰি পৰিচালনা কৰিব নোৱাৰে, কাৰণ <xliff:g id="APP">%1$s</xliff:g>এ আপোনাৰ ফ\'নটোক জাগ্ৰত কৰি ৰাখিছে।\n\nএই সমস্যাটো সমাধান কৰিবলৈ আপুনি এপটোক বন্ধ কৰিব পাৰে।\n\nযদি সেই পদক্ষেপটো লোৱাৰ পিছতো সমস্যাটো চলিয়েই থাকে, তেন্তে আপুনি বেটাৰিৰ খৰচ কম কৰিবলৈ এপটো আনইনষ্টল কৰিবলগীয়া হ\'ব পাৰে।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"আপোনাৰ টে\'বলেটটোৱে স্বাভাৱিকভাৱে বেটাৰি পৰিচালনা কৰিব নোৱাৰে, কাৰণ <xliff:g id="APP">%1$s</xliff:g> এ আপোনাৰ টে\'বলেটটোক জাগ্ৰত কৰি ৰাখিছে।\n\nএই সমস্যাটো সমাধান কৰিবলৈ আপুনি এপটোক বন্ধ কৰিব পাৰে।\n\nযদি সেই পদক্ষেপটো লোৱাৰ পিছতো সমস্যাটো চলিয়েই থাকে তেন্তে আপুনি বেটাৰিৰ খৰচ কম কৰিবলৈ এপটো আনইনষ্টল কৰিবলগীয়া হ\'ব পাৰে।"</string>
@@ -4500,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"টেবলেটটো পৰীক্ষা কৰিবলৈ টিপক"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইচটো পৰীক্ষা কৰিবলৈ টিপক"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত টিপক।"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"বিপদকালত সহায় বিচাৰিবলৈ ব্যৱহাৰ কৰা বুটাম"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ পৰিচালনা কৰা"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"পাৱাৰ বুটামটো ক্ষিপ্ৰতাৰে ৫ বাৰ টিপি জৰুৰীকালীন SOS কাৰ্যবিলাক আৰম্ভ কৰক।"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"সকীয়নিৰ ধ্বনি"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"কাৰ্যবিলাক আৰম্ভ কৰাৰ পূৰ্বে সতৰ্ক কৰি দিয়ক"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"জাননীৰ বাবে ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"জাননীবিলাক চাবলৈ আপোনাৰ ফ\'নটোৰ পিছফালে থকা ফিংগাৰপ্ৰিণ্ট ছেন্সৰত ওপৰৰ পৰা তললৈ আঙুলি বুলাওক।"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b9e2d96..d01c0bc 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planşeti yoxlamaq üçün klikləyin"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Cihazı yoxlamaq üçün klikləyin"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün ekrana klikləyin."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Həyəcan düyməsi"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> tərəfindən idarə edilir"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Enerji düyməsini 5 dəfə cəld basdıqda fövqəladə SOS əməliyyatları başladılsın."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Xəbərdarlıq səsi"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Əməliyyatlara başlamazdan əvvəl bildirilsin"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Fövqəladə halda SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> tərəfindən idarə edilir"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Enerji düyməsini 5 dəfə cəld basdıqda fövqəladə SOS əməliyyatları başladılsın."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Xəbərdarlıq səsi"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Əməliyyatlara başlamazdan əvvəl bildirilsin"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirişlər üçün barmaq izinizi sürüşdürün"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Barmaq izini sürüşdürün"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirişləri yoxlamaq üçün, barmaq izi sensorunda aşağı sürüşdürün."</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 33a0fda..d3b042f 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -4571,11 +4571,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da biste proverili tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da biste proverili uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da biste proverili vreme, obaveštenja i druge informacije, dodirnite ekran."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Dugme alarma za paniku"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Da biste pokrenuli radnje za hitne slučajeve, brzo dodirnite dugme za uključivanje 5 puta."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozorenja"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozorenje pre početka radnji"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Hitni slučajevi"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Da biste pokrenuli radnje za hitne slučajeve, brzo dodirnite dugme za uključivanje 5 puta."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Zvuk upozorenja"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Upozorenje pre početka radnji"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prevucite prstom za obaveštenja"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prevucite prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fc8c133..60c1fdc 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -2046,7 +2046,7 @@
     <skip />
     <string name="service_background_processes" msgid="2800539421534521948">"Свабодна: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="service_foreground_processes" msgid="6380905887193621704">"Выкар.: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
-    <string name="memory" msgid="5253757199926592074">"RAM (АЗП)"</string>
+    <string name="memory" msgid="5253757199926592074">"RAM"</string>
     <!-- no translation found for service_process_name (7827318358399776412) -->
     <skip />
     <string name="running_process_item_user_label" msgid="1444898861984132133">"Карыстальнiк: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Націсніце, каб праверыць планшэт"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Націсніце, каб праверыць прыладу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, дакраніцеся да экрана."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Трывожная кнопка"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Пад кіраваннем праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Запусціце экстранны выклік SOS, хутка націснуўшы кнопку сілкавання 5 разоў."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Гук заўвагі"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Адпраўляць абвестку да запуску дзеянняў"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Экстранны выклік SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Пад кіраваннем праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Запусціце экстранны выклік SOS, хутка націснуўшы кнопку сілкавання 5 разоў."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Гук папярэджання"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Адпраўляць абвестку да запуску дзеянняў"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер адбіткаў"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку тэлефона."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cdf5ea2..98043c8 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Докоснете за проверка на таблета"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Докоснете за проверка на устройството"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"За да проверите часа, известията и друга информация, докоснете екрана."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Паник бутон"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Управлява се от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Стартирайте действията при спешни случаи (SOS) с бързо петкратно натискане на бутона за включване/изключване."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Предупредителен звук"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Сигнал преди стартиране на действията"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Спешен случай (SOS)"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Управлява се от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Стартирайте действията при спешни случаи (SOS) с бързо петкратно натискане на бутона за включване/изключване."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Предупредителен звук"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Сигнал преди стартиране на действията"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Преглед на известията с плъзване през сензора за отпечатъци"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Плъзване през сензора за отпечат."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на телефона си."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index cc95a5b..9d320af 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1734,24 +1734,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কাজের জন্য অবস্থান ভিত্তিক পরিষেবা"</string>
-    <!-- no translation found for location_time_zone_detection_screen_title (8396625087466311625) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_title (1195178875042989835) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_description (1064716900984397624) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_on (5514817179120761597) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_off (192427076195667079) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_auto_is_off (8067073548483627695) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_applicable (6757964612836952714) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_supported (3251181656388306501) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_allowed (8264525161514617051) -->
-    <skip />
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"বর্তমান টাইম জোন শনাক্ত করার জন্য ডিভাইসের লোকেশন ব্যবহার করতে অনুমতি দেয়। অন্যান্য লোকেশন সেটিংস যেমন ওয়াই-ফাই স্ক্যানিং নির্ভুলভাবে টাইম জোন শনাক্ত করার ব্যাপারটি প্রভাবিত করতে পারে।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"চালু আছে"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"বন্ধ আছে"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"টাইম জোন অটোমেটিক শনাক্ত করার বিকল্প বন্ধ করা আছে"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প বন্ধ করা আছে"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প কাজ করছে না"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প পরিবর্তনের অনুমতি নেই"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ওয়াই-ফাই ও মোবাইল নেটওয়ার্ক লোকেশন"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"দ্রুত আপনার লোকেশন নির্ধারণ করতে অ্যাপগুলিকে Google লোকেশন পরিষেবা ব্যবহার করতে দিন। বেনামী লোকেশন ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ওয়াই-ফাই দ্বারা লোকেশন নির্ণয় করা হয়েছে"</string>
@@ -2519,10 +2510,8 @@
       <item quantity="other">%1$dটি অ্যাপে বিধিনিষেধ আরোপ করা হয়েছে</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"আপনার ব্যাটারির মিটার পড়ার সময় সমস্যা হয়েছে"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"আপনার ব্যাটারির মিটার পড়ার সময় সমস্যা হয়েছে। "<annotation id="url">"আরও জানতে"</annotation>" ট্যাপ করুন"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"অ্যাপটি বন্ধ করবেন?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ফোনকে জাগিয়ে রাখছে, তাই আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ট্যাবলেট জাগিয়ে রাখছে, তাই আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
@@ -3585,15 +3574,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"গুরুত্বপূর্ণ কথোপকথন"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"কথোপকথনের বিভাগের উপরে দেখুন এবং ফ্লোটিং বাবলের মতো দেখাবে"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"কথোপকথন বিভাগের একদম উপরে দেখুন"</string>
-    <!-- no translation found for other_conversations (551178916855139870) -->
-    <skip />
+    <string name="other_conversations" msgid="551178916855139870">"গুরুত্বপূর্ণ নয় এমন কথোপকথন"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"কথোপকথনে আপনার করা পরিবর্তন"</string>
-    <!-- no translation found for recent_conversations (471678228756995274) -->
-    <skip />
-    <!-- no translation found for conversation_settings_clear_recents (7502738708058226585) -->
-    <skip />
-    <!-- no translation found for clear (5092178335409471100) -->
-    <skip />
+    <string name="recent_conversations" msgid="471678228756995274">"সাম্প্রতিক কথোপকথন"</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>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"গুরুত্বপূর্ণ এবং পরিবর্তন করা কথোপকথন এখানে দেখানো হবে"</string>
@@ -4141,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> এর জন্য \'বিরক্ত করবে না\' তে অ্যাক্সেস প্রত্যাহার করবেন?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"এই অ্যাপ্লিকেশানের দ্বারা তৈরি হওয়া সমস্ত \'বিরক্ত করবে না\' নিয়মগুলিকে সরানো হবে৷"</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"অপ্টিমাইজ করবেন না"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"অপ্টিমাইজ করুন"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"এতে চার্জ আরও দ্রুত শেষ হয়ে যেতে পারে। ব্যাকগ্রাউন্ডে ব্যাটারি ব্যবহার করা থেকে অ্যাপটিকে আর সীমাবদ্ধ করা হবে না।"</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ব্যাটারির আয়ু বাড়ানোর জন্য প্রস্তাবিত"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"<xliff:g id="APP">%s</xliff:g> -কে ব্যাটারি অপ্টিমাইজেশান উপেক্ষা করার অনুমতি দেবেন?"</string>
@@ -4513,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ট্যাবলেট যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইস যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ট্যাপ করুন।"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"প্যানিক বোতাম"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর ম্যানেজ করা"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"পাওয়ার বোতাম ৫ বার দ্রুত প্রেস করে জরুরি SOS অ্যাকশন চালু করুন।"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"সতর্কতামূলক শব্দ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"অ্যাকশন শুরু করার আগে সতর্কতা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4891540..c9a5acf 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -4571,11 +4571,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da provjerite tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da provjerite uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da provjerite vrijeme, obavještenja i druge informacije, dodirnite ekran."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Dugme za uzbunu"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Funkcijom upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pokrenite radnje za pomoć u hitnim slučajevima brzim pritiskanjem dugmeta za isključivanje u trajanju od 5 sekundi."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozorenja"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozorenje prije započinjanja radnji"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Pomoć u hitnim slučajevima"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Funkcijom upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Pokrenite radnje za pomoć u hitnim slučajevima brzim pritiskanjem dugmeta za isključivanje 5 puta."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Zvuk upozorenja"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Upozorenje prije pokretanja radnji"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prevucite prstom za obavještenja"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prevlačenje prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da provjerite obavještenja, prevucite prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d5a0a7a..84a2fec 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -3067,12 +3067,12 @@
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Vols suprimir el convidat?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Suprimeix"</string>
-    <string name="user_enable_calling" msgid="264875360626905535">"Activa les trucades"</string>
-    <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activa les trucades i els SMS"</string>
+    <string name="user_enable_calling" msgid="264875360626905535">"Activa les trucades telefòniques"</string>
+    <string name="user_enable_calling_sms" msgid="8546430559552381324">"Activa les trucades telefòniques i els SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"Suprimeix l\'usuari"</string>
-    <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"Vols activar les trucades?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="7868894792723368364">"Vols activar les trucades telefòniques?"</string>
     <string name="user_enable_calling_confirm_message" msgid="4924965198409050155">"L\'historial de trucades es compartirà amb aquest usuari."</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"Vols activar les trucades i els SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"Vols activar les trucades telefòniques i els SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"L\'historial de trucades i d\'SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="8233682750953695582">"Informació d\'emergència"</string>
     <string name="emergency_info_summary" msgid="8463622253016757697">"Informació i contactes de: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3629,9 +3629,9 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"Cap aplicació instal·lada no ha sol·licitat accés a les notificacions."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Permet l\'accés a les notificacions"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Vols que <xliff:g id="SERVICE">%1$s</xliff:g> tingui accés a les notificacions?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades telefòniques. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Vols que <xliff:g id="SERVICE">%1$s</xliff:g> tingui accés a les notificacions?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. Aquesta aplicació també podrà ignorar les notificacions o fer accions amb els botons de les notificacions, com ara contestar a trucades telefòniques. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Si desactives l\'accés a les notificacions per a <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, és possible que també es desactivi l\'accés al mode No molestis."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactiva"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancel·la"</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca per consultar la tauleta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toca per consultar el dispositiu"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Per veure l\'hora, les notificacions i altres dades, toca la pantalla."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botó del pànic"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gestionat per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Per iniciar les accions d\'emergència, prem el botó d\'engegada 5 vegades ràpidament."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"So d\'advertiment"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Mostra una alerta abans d\'iniciar les accions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Accions d\'emergència"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestionat per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Inicia les accions d\'emergència prement el botó d\'engegada 5 vegades ràpidament."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"So d\'advertiment"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Mostra una alerta abans d\'iniciar les accions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Fes lliscar l\'empremta digital per veure notificacions"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fes lliscar l\'empremta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes dactilars de la part posterior del telèfon."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8d51cae..e2eb581 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Kontrola tabletu klepnutím"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Kontrola zařízení klepnutím"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Chcete-li zobrazit čas, oznámení a další informace, klepněte na obrazovku."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Tlačítko zvukového alarmu"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Spravováno aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Nouzové SOS akce spustíte, když pětkrát za sebou rychle stisknete vypínač."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozornění"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozornění před zahájením akce"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nouzové SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Spravováno aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Nouzové SOS akce spustíte, když pětkrát za sebou rychle stisknete vypínač."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Zvuk upozornění"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Upozornění před zahájením akce"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sejmout otisk prstu pro zobrazení oznámení"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sejmout otisk prstu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b50fc9c..75e93b3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tryk for at tjekke din tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tryk for at tjekke enheden"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tryk på skærmen for at se klokkeslæt, notifikationer og andre oplysninger."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panikknap"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Administreret af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start nødhandlinger ved at trykke på afbryderknappen hurtigt fem gange."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Advarselslyd"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Lav en lyd, inden handlingerne påbegyndes"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Funktion til nødsituationer"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Administreret af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start nødhandlinger ved at trykke på afbryderknappen hurtigt fem gange."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Advarselslyd"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Afspil en lyd, inden handlingerne påbegyndes"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Stryg over fingeraftrykslæser for at se notifikationer"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Stryg fingeraftryk"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Du kan tjekke dine notifikationer ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3cc338b..6ef9234 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2511,10 +2511,8 @@
       <item quantity="one">%1$d App beschränkt</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"Batterieanzeige konnte nicht gelesen werden"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Batterieanzeige konnte nicht gelesen werden. "<annotation id="url">"Für weitere Informationen tippen"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"App beenden?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Smartphones zu erhöhen."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Tablets zu erhöhen."</string>
@@ -4501,11 +4499,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Beim Tippen Display aktivieren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Beim Tippen Display aktivieren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Wenn du auf den Bildschirm tippst, werden die Uhrzeit, Benachrichtigungen und andere Informationen angezeigt."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniktaste"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Verwaltet von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Drücke fünfmal schnell die Ein-/Aus-Taste, um die Aktionen für Notfälle zu starten."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warnton"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Warnung vor Beginn der Aktionen"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Benachrichtigungen durch Wischen über Fingerabdrucksensor öffnen"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fingerabdrucksensor verwenden"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Zum Lesen von Benachrichtigungen von oben nach unten über den Fingerabdrucksensor auf der Rückseite des Smartphones wischen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cce8c7a..d6f2392 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Πατήστε για έλεγχο του tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Πατήστε για έλεγχο της συσκευής"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Πατήστε την οθόνη για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Κουμπί πανικού"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Διαχείριση από <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Ξεκινήστε τις ενέργειες SOS έκτακτης ανάγκης, πατώντας γρήγορα το κουμπί λειτουργίας 5 φορές."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Ήχος ειδοποίησης"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Ειδοποίηση πριν από την έναρξη δράσεων"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS έκτακτης ανάγκης"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Διαχείριση από <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Ξεκινήστε τις ενέργειες SOS έκτακτης ανάγκης, πατώντας γρήγορα το κουμπί λειτουργίας 5 φορές."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Ήχος προειδοποίησης"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Ειδοποίηση πριν από την έναρξη των ενεργειών"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Σύρετε στον αισθητήρα δακτυλικών αποτυπωμάτων για ειδοποιήσεις"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Ολίσθηση δακτυλ. αποτυπ."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του τηλεφώνου."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7f8af38..95f99ad 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Warning sound"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alert before starting the actions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 810f895..0439fa1 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Warning sound"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alert before starting the actions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d32916e..57d56ea 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Warning sound"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alert before starting the actions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0e6e276..64a22b1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Warning sound"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert before starting the actions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start the emergency SOS actions by pressing the power button quickly five times."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Warning sound"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alert before starting the actions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index c35e183..59022b9 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎Tap to check tablet‎‏‎‎‏‎"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎Tap to check device‎‏‎‎‏‎"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎To check time, notifications, and other info, tap your screen.‎‏‎‎‏‎"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎Panic button‎‏‎‎‏‎"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‎Managed by ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎Start the emergency SOS actions by pressing the power button quickly 5 times.‎‏‎‎‏‎"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎Warning sound‎‏‎‎‏‎"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎Alert before starting the actions‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎Emergency SOS‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎Managed by ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎Start the emergency SOS actions by pressing the power button quickly 5 times.‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎Warning sound‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎Alert before starting the actions‎‏‎‎‏‎"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎Swipe fingerprint for notifications‎‏‎‎‏‎"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎Swipe fingerprint‎‏‎‎‏‎"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎To check your notifications, swipe down on the fingerprint sensor on the back of your phone.‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f7dafb6..6645df4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Presiona para revisar la tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Presiona para revisar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar la hora, las notificaciones y otra información, presiona la pantalla."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botón de pánico"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Administrada por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Para iniciar las acciones de ayuda en emergencias, presiona rápido el botón de encendido 5 veces."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sonido de advertencia"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alerta previa al inicio de las acciones"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Ayuda en emergencias"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Administrador: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Para iniciar las acciones de ayuda en emergencias, presiona rápido el botón de encendido 5 veces."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Sonido de advertencia"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alerta previa al inicio de las acciones"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar tu huella para ver notificaciones"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar huella digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 32feabb..024817f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1734,24 +1734,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las aplicaciones y los servicios busquen dispositivos cercanos en cualquier momento aunque la conexión Bluetooth esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
-    <!-- no translation found for location_time_zone_detection_screen_title (8396625087466311625) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_title (1195178875042989835) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_description (1064716900984397624) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_on (5514817179120761597) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_off (192427076195667079) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_auto_is_off (8067073548483627695) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_applicable (6757964612836952714) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_supported (3251181656388306501) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_allowed (8264525161514617051) -->
-    <skip />
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria por ubicación"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria por ubicación"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que se utilice la ubicación del dispositivo para detectar la zona horaria actual. Otros ajustes de ubicación (como la búsqueda de redes Wi‑Fi) pueden afectar a la precisión de la detección de la zona horaria."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Se ha inhabilitado la detección automática de la zona horaria"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La detección de la zona horaria por ubicación está inhabilitada"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"No se admite la detección de la zona horaria por ubicación"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No se permiten cambios en la detección de la zona horaria por ubicación"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Ubicación por red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Ubicación determinada por Wi-Fi"</string>
@@ -3583,15 +3574,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversaciones prioritarias"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Mostrar en la parte superior de la sección de conversaciones y en forma de burbuja"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Mostrar en la parte superior de la sección de conversaciones"</string>
-    <!-- no translation found for other_conversations (551178916855139870) -->
-    <skip />
+    <string name="other_conversations" msgid="551178916855139870">"Conversaciones no prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversaciones en las que has hecho cambios"</string>
-    <!-- no translation found for recent_conversations (471678228756995274) -->
-    <skip />
-    <!-- no translation found for conversation_settings_clear_recents (7502738708058226585) -->
-    <skip />
-    <!-- no translation found for clear (5092178335409471100) -->
-    <skip />
+    <string name="recent_conversations" msgid="471678228756995274">"Conversaciones recientes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recientes"</string>
+    <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Convertir conversaciones prioritarias en burbujas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Las conversaciones prioritarias se muestran en la parte superior del panel desplegable. También puedes configurarlas para que se muestren en burbujas y puedan interrumpirte aunque esté activado No molestar."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Aquí se mostrarán las conversaciones prioritarias y las modificadas"</string>
@@ -4511,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca para comprobar el tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toca para comprobar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para ver la hora, las notificaciones y otra información, toca la pantalla."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botón de pánico"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Puedes iniciar las acciones de SOS de emergencia pulsando el botón de encendido 5 veces rápidamente."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sonido de alerta"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Avisar antes de iniciar las acciones"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS de emergencia"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Puedes iniciar las acciones de SOS de emergencia pulsando el botón de encendido 5 veces rápidamente."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Sonido de alerta"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Avisar antes de iniciar las acciones"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar por el sensor de huellas para ver notificaciones"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar por sensor de huella digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales de la parte trasera del teléfono."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 6dc934d..3fe0bb1 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Puudutamine tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Puudutamine seadme kontrollimiseks"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Kellaaja, märguannete ja muu teabe vaatamiseks puudutage oma ekraani."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paanikanupp"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Haldab <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Hädaolukorra SOS-toimingute käivitamiseks vajutage kiiresti viis korda järjest toitenuppu."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Hoiatusheli"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Hoiata enne toimingute käivitamist"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Hädaolukorra SOS-teavitus"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Haldab <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Hädaolukorra SOS-toimingute käivitamiseks vajutage kiiresti viis korda järjest toitenuppu."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Hoiatusheli"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Hoiata enne toimingute käivitamist"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sõrmejälje pühkimine märguannete vaatamiseks"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sõrmejälje pühkimine"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Märguannete kontrollimiseks pühkige telefoni tagaküljel oleval sõrmejäljeanduril alla."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 773730b..01c3930 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Sakatu tableta egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Sakatu gailua egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Izu-botoia"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Kudeatzailea: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Larrialdi-ekintzak abiarazteko, sakatu etengailua azkar bost aldiz."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Abisu-soinua"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Jo alerta bat ekintzak abiarazi aurretik"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Larrialdia"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Kudeatzailea: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Larrialdi-ekintzak abiarazteko, sakatu etengailua azkar bost aldiz."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Abisu-soinua"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Jo alerta bat ekintzak abiarazi aurretik"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pasatu hatza sentsoretik jakinarazpenak ikusteko"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Pasatu hatza sentsoretik"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Jakinarazpenei begiratu bat emateko, pasatu hatza behera telefonoaren atzealdeko hatz-marken sentsorean."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c62c631..2767e0f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ضربه زدن برای بررسی رایانه لوحی"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ضربه زدن برای بررسی دستگاه"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش ضربه بزنید."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"دکمه وحشت"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"تحت مدیریت <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"با پنج‌بار فشار دادن سریع دکمه روشن/خاموش، کنش‌های مربوط به درخواست کمک اضطراری را شروع کنید."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"صدای هشدار"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"اعلام هشدار پیش از شروع کنش‌ها"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"کمک اضطراری"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"تحت مدیریت <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"با پنج‌بار فشار دادن سریع دکمه روشن/خاموش، کنش‌های مربوط به درخواست کمک اضطراری را شروع کنید."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"صدای هشدار"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"هشدار پیش از شروع کنش‌ها"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تند کشیدن اثر انگشت برای اعلان‌ها"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تند کشیدن اثر انگشت"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت تلفن) تند به‌پایین بکشید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f010e16..2fe3b08 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tarkista tabletin ilmoitukset napauttamalla"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tarkista laitteen ilmoitukset napauttamalla"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Napauta näyttöä, niin näet ajan, ilmoitukset ja muita tietoja."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniikkinappula"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Hallinnoija: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Aloita hätätilannepalvelujen käyttö painamalla virtapainiketta nopeasti viisi kertaa."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Varoitusääni"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Ilmoita ennen aloittamista"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Hätätilanne"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Hallinnoija: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Aloita hätätilannepalvelujen käyttö painamalla virtapainiketta nopeasti viisi kertaa."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Varoitusääni"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Ilmoita ennen aloittamista"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pyyhkäise ilmoitukset esiin"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sormenjäljen pyyhkäisy"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 8cad43f..28cda1e 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -3577,7 +3577,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversations non prioritaires"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations auxquelles vous avez apporté des modifications"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversations récentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Eff. conv. récentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Eff. celles récentes"</string>
     <string name="clear" msgid="5092178335409471100">"Effacer"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afficher les conversations prioritaires en bulles"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les conversations prioritaires s\'affichent dans le haut du volet déroulant. Vous pouvez aussi les configurer pour qu\'elles s\'affichent dans des bulles et interrompent le mode Ne pas déranger."</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toucher pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toucher pour vérifier l\'appareil"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, touchez l\'écran."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Bouton de panique"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gestion effectuée par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Démarrez les actions de SOS d\'urgence en appuyant rapidement cinq fois sur l\'interrupteur."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Son d\'avertissement"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Émettre une alerte avant de démarrer les actions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Alerte SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestion effectuée par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Démarrez les actions de SOS d\'urgence en appuyant rapidement cinq fois sur l\'interrupteur."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Son d\'avertissement"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Émettre une alerte avant de démarrer les actions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Balayer le lecteur d\'empreintes pour voir les notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Balayer empreinte digit."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pour consulter vos notifications, passer votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5b3b104..f0af53f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3577,7 +3577,7 @@
     <string name="other_conversations" msgid="551178916855139870">"Conversations non prioritaires"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations auxquelles vous avez apporté des modifications"</string>
     <string name="recent_conversations" msgid="471678228756995274">"Conversations récentes"</string>
-    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Eff. conv. récentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Effacer conv. récentes"</string>
     <string name="clear" msgid="5092178335409471100">"Effacer"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afficher les conversations prioritaires sous forme de bulle"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les conversations prioritaires s\'affichent en haut du volet déroulant. Vous pouvez aussi les configurer pour s\'afficher dans des bulles et les autoriser à interrompre le mode Ne pas déranger."</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Appuyer pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Appuyer pour vérifier l\'appareil"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Pour afficher l\'heure, les notifications et d\'autres informations, appuyez sur l\'écran."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Bouton d\'appel d\'urgence"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Géré par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Appelez les services d\'urgence en appuyant rapidement cinq fois sur le bouton Marche/Arrêt."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Son d\'avertissement"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alerter avant de démarrer les actions"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Géré par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Appelez les services d\'urgence en appuyant rapidement cinq fois sur le bouton Marche/Arrêt."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Son d\'avertissement"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alerter avant de démarrer les actions"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Balayer le lecteur d\'empreinte digitale pour voir les notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Balayer lecteur empreinte"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f9478fd..2cb3531 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca para consultar a tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para consultar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar a hora, as notificacións e outra información, toca a pantalla."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botón de pánico"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Xestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Inicia as accións SOS de emerxencia premendo rapidamente o botón de acendido 5 veces."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Son de advertencia"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Mostrar unha alerta antes de iniciar as accións"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS de emerxencia"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Xestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Inicia as accións SOS de emerxencia premendo rapidamente o botón de acendido 5 veces."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Son de advertencia"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Fai soar unha alerta antes de iniciar as accións"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pasar o dedo polo sensor de impresións dixitais para ver as notificacións"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Pasar dedo polo sensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 1c2cd5c..fa7a376 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -176,7 +176,7 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4669222334822978847">"કોઈ નહીં"</item>
     <item msgid="6242198071587397280">"મેન્યુઅલ"</item>
-    <item msgid="464383874780058242">"પ્રોક્સી આપમેળે ગોઠવો"</item>
+    <item msgid="464383874780058242">"પ્રોક્સી ઑટોમૅટિક રીતે ગોઠવો"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="2900892411844440682">"કોઈ નહીં"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 302207f..8cf21da 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -237,7 +237,7 @@
     <string name="settings_shortcut" msgid="8548239727871847171">"સેટિંગ્સ શૉર્ટકટ"</string>
     <string name="airplane_mode" msgid="3196085857882526817">"એરપ્લેન મોડ"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"વાયરલેસ અને નેટવર્ક્સ"</string>
-    <string name="radio_controls_summary" msgid="9028430178697624501">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
+    <string name="radio_controls_summary" msgid="9028430178697624501">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક અને VPN મેનેજ કરો"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"મોબાઇલ નેટવર્ક દ્વારા ડેટા વપરાશની મંજૂરી આપો"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"રોમિંગ પર હોય ત્યારે ડેટા ઉપયોગની મંજૂરી આપો"</string>
     <string name="roaming" msgid="3055365654530847985">"રોમિંગ"</string>
@@ -697,7 +697,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5257744297562880017">"બ્લૂટૂથ ચાલુ કરો"</string>
     <string name="bluetooth_settings" msgid="2967239493428695171">"બ્લૂટૂથ"</string>
     <string name="bluetooth_settings_title" msgid="2642029095769509647">"બ્લૂટૂથ"</string>
-    <string name="bluetooth_settings_summary" msgid="6805458703566046784">"કનેક્શન્સ સંચાલિત કરો, ઉપકરણનું નામ અને શોધક્ષમતા સેટ કરો"</string>
+    <string name="bluetooth_settings_summary" msgid="6805458703566046784">"કનેક્શન મેનેજ કરો, ડિવાઇસનું નામ અને શોધક્ષમતા સેટ કરો"</string>
     <string name="bluetooth_pairing_request" msgid="7762990650683525640">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="1329835708475701761">"બ્લૂટૂથ નો જોડી બનાવવાનો કોડ"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5806420933599368592">"જોડી બનાવવાનો કોડ લખો તે પછી Return અથવા Enter દબાવો"</string>
@@ -816,7 +816,7 @@
     <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"વાઇ-ફાઇ સેટિંગ્સ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"વાઇ-ફાઇ"</string>
-    <string name="wifi_settings_summary" msgid="784074686763572811">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
+    <string name="wifi_settings_summary" msgid="784074686763572811">"વાયરલેસ ઍક્સેસ પૉઇન્ટને સેટ અને મેનેજ કરો"</string>
     <string name="wifi_select_network" msgid="6692897876718813259">"વાઇ-ફાઇ પસંદ કરો"</string>
     <string name="wifi_starting" msgid="6147022683967506341">"વાઇ-ફાઇ ચાલુ કરી રહ્યું છે…"</string>
     <string name="wifi_stopping" msgid="4471699665741299711">"વાઇ-ફાઇ બંધ થઈ રહ્યું છે…"</string>
@@ -825,8 +825,8 @@
     <string name="wifi_in_airplane_mode" msgid="1235412508135267981">"એરપ્લેન મોડમાં"</string>
     <string name="wifi_notify_open_networks" msgid="2610323626246818961">"સાર્વજનિક નેટવર્ક માટે નોટિફિકેશન મેળવો"</string>
     <string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"જ્યારે ઉચ્ચ ગુણવત્તાવાળું સાર્વજનિક નેટવર્ક ઉપલબ્ધ હોય ત્યારે નોટિફિકેશન આપો"</string>
-    <string name="wifi_wakeup" msgid="3834327315861781611">"વાઇ-ફાઇ આપમેળે ચાલુ કરો"</string>
-    <string name="wifi_wakeup_summary" msgid="5778059083790221465">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
+    <string name="wifi_wakeup" msgid="3834327315861781611">"વાઇ-ફાઇ ઑટોમૅટિક રીતે ચાલુ કરો"</string>
+    <string name="wifi_wakeup_summary" msgid="5778059083790221465">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ક્વૉલિટીના નેટવર્કની નજીકમાં ઑટોમૅટિક રીતે ફરી ચાલુ થશે"</string>
     <string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"અનુપલબ્ધ છે, કારણ કે સ્થાન બંધ છે. "<annotation id="link">"સ્થાન"</annotation>" ચાલુ કરો."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="1771489741850119751">"અનુપલબ્ધ છે કારણ કે વાઇ-ફાઇ સ્કૅનિંગ બંધ છે"</string>
     <string name="wifi_wakeup_summary_scoring_disabled" msgid="3615120120960539780">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
@@ -834,7 +834,7 @@
     <string name="wifi_poor_network_detection_summary" msgid="383834617032605347">"જ્યાં સુધી વાઇ-ફાઇ સારું ઇન્ટરનેટ કનેક્શન ધરાવતું ન હોય ત્યાં સુધી તેના નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4993203473116721772">"ફક્ત સારું ઇન્ટરનેટ કનેક્શન ધરાવતા નેટવર્કનો જ ઉપયોગ કરો"</string>
     <string name="use_open_wifi_automatically_title" msgid="7193846454986712009">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"ઉચ્ચ ગુણવત્તાવાળા સાર્વજનિક નેટવર્ક સાથે આપમેળે કનેક્ટ કરો"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="6663890845558591023">"ઉચ્ચ ક્વૉલિટીના સાર્વજનિક નેટવર્ક સાથે ઑટોમૅટિક રીતે કનેક્ટ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="2299284032301667622">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="1780306481499369913">"આ સુવિધાનો ઉપયોગ કરવા માટે, સુસંગત નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_install_credentials" msgid="5192903644606839972">"પ્રમાણપત્રો ઇન્સ્ટૉલ કરો"</string>
@@ -853,8 +853,8 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"જ્યારે વાઇ-ફાઇ પાસે ઇન્ટરનેટનો ઍક્સેસ ન હોય, ત્યારે મોબાઇલ ડેટાનો ઉપયોગ કરો. ડેટા વપરાશ શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"નેટવર્ક ઉમેરો"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"વાઇ-ફાઇ પસંદગીઓ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"વાઇ-ફાઇ ફરી આપમેળે ચાલુ થાય છે"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"વાઇ-ફાઇ પાછું આપમેળે ચાલુ થતું નથી"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"વાઇ-ફાઇ ફરી ઑટોમૅટિક રીતે ચાલુ થાય છે"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="5710203586018223864">"વાઇ-ફાઇ પાછું ઑટોમૅટિક રીતે ચાલુ થતું નથી"</string>
     <string name="wifi_access_points" msgid="5846755709207101844">"વાઇ-ફાઇ નેટવર્ક"</string>
     <string name="wifi_menu_more_options" msgid="1236651929987819716">"વધુ વિકલ્પો"</string>
     <string name="wifi_menu_p2p" msgid="5234165837732940385">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
@@ -871,7 +871,7 @@
     <string name="wifi_more" msgid="8742256421693351035">"વધુ"</string>
     <string name="wifi_setup_wps" msgid="4303694722593999931">"ઑટોમૅટિક સેટઅપ (WPS)"</string>
     <string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરીએ?"</string>
-    <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"આપમેળે વાઇ-ફાઇ ચાલુ કરવા માટે, તમારે પહેલા વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરવું જરૂરી છે."</string>
+    <string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"ઑટોમૅટિક રીતે વાઇ-ફાઇ ચાલુ કરવા માટે, તમારે પહેલા વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કરવું જરૂરી છે."</string>
     <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"વાઇ-ફાઇ બંધ હોય, ત્યારે પણ વાઇ-ફાઇ સ્કૅનિંગ ગમે ત્યારે ઍપ અને સેવાઓને વાઇ-ફાઇ નેટવર્ક સ્કૅન કરવાની મંજૂરી આપે છે. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન-આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"ચાલુ કરો"</string>
     <string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"વાઇ-ફાઇ સ્કૅનિંગ ચાલુ કર્યું છે"</string>
@@ -903,7 +903,7 @@
     <string name="wifi_password" msgid="1458802324849513755">"પાસવર્ડ"</string>
     <string name="wifi_show_password" msgid="6865993988238157923">"પાસવર્ડ બતાવો"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP બેન્ડ પસંદ કરો"</string>
-    <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"આપમેળે"</string>
+    <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"ઑટોમૅટિક રીતે"</string>
     <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 GHz બેન્ડ"</string>
     <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 GHz બેન્ડ"</string>
     <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 GHz બૅન્ડ પસંદ કર્યું"</string>
@@ -1177,10 +1177,10 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"સુવિધાજનક"</string>
     <string name="color_mode_summary_natural" msgid="8298840714001791628">"માત્ર સચોટ રંગોનો જ ઉપયોગ કરો"</string>
     <string name="color_mode_summary_automatic" msgid="8157885594041700275">"આબેહૂબ અને સચોટ રંગો વચ્ચે સમાયોજિત કરો"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"ટૅબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"ટૅબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને ઑટોમૅટિક રીતે સ્વિચ કરો"</string>
     <string name="brightness" msgid="6216871641021779698">"સ્ક્રીનની બ્રાઇટનેસનું સ્તર"</string>
     <string name="brightness_title" msgid="5457874893085305155">"તેજ"</string>
     <string name="brightness_summary" msgid="6309641759293018049">"સ્ક્રીનનાં તેજને સમાયોજિત કરો"</string>
@@ -1203,7 +1203,7 @@
     <string name="auto_brightness_off_summary" msgid="4993150980274474226">"ઉપલબ્ધ લાઇટ માટે સમાયોજિત કરશો નહીં"</string>
     <string name="auto_brightness_very_high_summary" msgid="2784981315548144255">"વધારેલ બૅટરી વપરાશ"</string>
     <string name="auto_brightness_disclaimer" msgid="1868395832774087351">"ઉપલબ્ધ પ્રકાશ માટેનાં તેજ સ્તરને ઑપ્ટિમાઇઝ કરો. જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે પણ તમે તેજને અસ્થાયી રૂપે સમાયોજિત કરી શકો છો."</string>
-    <string name="auto_brightness_description" msgid="6807117118142381193">"તમારી સ્ક્રીનનું બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે આપમેળે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
+    <string name="auto_brightness_description" msgid="6807117118142381193">"તમારી સ્ક્રીનની બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે ઑટોમૅટિક રીતે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"વ્હાઇટ બૅલેન્સ ડિસ્પ્લે"</string>
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
@@ -1231,12 +1231,12 @@
     <string name="night_display_temperature_title" msgid="857248782470764263">"તીવ્રતા"</string>
     <string name="night_display_summary_off" msgid="4676320734342206009">"બંધ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"ક્યારેય ઑટોમૅટિક રીતે ચાલુ નહીં થાય"</string>
-    <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે ચાલુ થઈ જશે"</string>
-    <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"સૂર્યાસ્ત સમયે આપમેળે ચાલુ થઈ જશે"</string>
+    <string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
+    <string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"સૂર્યાસ્ત સમયે ઑટોમૅટિક રીતે ચાલુ થઈ જશે"</string>
     <string name="night_display_summary_on" msgid="8932395375143965229">"ચાલુ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"આપમેળે ક્યારેય બંધ નહીં થાય"</string>
-    <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે આપમેળે બંધ થઈ જશે"</string>
-    <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"સૂર્યોદય સમયે આપમેળે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"ઑટોમૅટિક રીતે ક્યારેય બંધ નહીં થાય"</string>
+    <string name="night_display_summary_on_auto_mode_custom" msgid="2096677025343425755">"<xliff:g id="ID_1">%1$s</xliff:g> વાગ્યે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
+    <string name="night_display_summary_on_auto_mode_twilight" msgid="8070517472000680361">"સૂર્યોદય સમયે ઑટોમૅટિક રીતે બંધ થઈ જશે"</string>
     <string name="night_display_activation_on_manual" msgid="7999294858026069365">"હમણાં ચાલુ કરો"</string>
     <string name="night_display_activation_off_manual" msgid="4842907786868153218">"હમણાં બંધ કરો"</string>
     <string name="night_display_activation_on_twilight" msgid="3440889451767582067">"સૂર્યોદય સુધી ચાલુ રાખો"</string>
@@ -1734,24 +1734,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"બ્લૂટૂથ સ્કેનિંગ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકના ઉપકરણો સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"કાર્ય માટે સ્થાનની સેવાઓ"</string>
-    <!-- no translation found for location_time_zone_detection_screen_title (8396625087466311625) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_title (1195178875042989835) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_description (1064716900984397624) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_on (5514817179120761597) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_off (192427076195667079) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_auto_is_off (8067073548483627695) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_applicable (6757964612836952714) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_supported (3251181656388306501) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_allowed (8264525161514617051) -->
-    <skip />
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"સ્થાનના સમય ઝોનની ઓળખ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"સ્થાનના સમય ઝોનની ઓળખ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"હાલના સમય ઝોનની ઓળખ કરવા માટે, ડિવાઇસના સ્થાનનો ઉપયોગ કરવાની મંજૂરી આપે છે. વાઇ-ફાઇ સ્કૅનિંગ જેવા અન્ય સ્થાન સેટિંગ, સમય ઝોનની ઓળખ કરવાની સચોટતા પર અસર કરી શકે છે."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ચાલુ છે"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"બંધ છે"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ઑટોમૅટિક રીતે સમય ઝોનની ઓળખ કરવાનું બંધ છે"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"સ્થાનના સમય ઝોનની ઓળખ બંધ કરવામાં આવેલી છે"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"સ્થાનના સમય ઝોનની ઓળખ કરવાને સપોર્ટ આપવામાં આવતો નથી"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"સ્થાનના સમય ઝોનની ઓળખમાં ફેરફાર કરવાની મંજૂરી નથી"</string>
     <string name="location_network_based" msgid="5247042890080021887">"વાઇ-ફાઇ અને મોબાઇલ નેટવર્ક સ્થાન"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"એપ્લિકેશન્સને તમારા સ્થાનનો વધુ ઝડપથી અંદાજ મેળવવા માટે Google ની સ્થાન સેવાનો ઉપયોગ કરવા દો. અનામી સ્થાન ડેટા એકત્રિત કરીને Google ને મોકલવામાં આવશે."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"સ્થાન વાઇ-ફાઇ દ્વારા નિર્ધારિત થયું"</string>
@@ -1882,7 +1873,7 @@
     <string name="manageapplications_settings_title" msgid="9198876415524237657">"એપ્લિકેશન્સનું સંચાલન કરો"</string>
     <string name="manageapplications_settings_summary" msgid="848586372489062357">"ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સનું સંચાલન કરો અને દૂર કરો"</string>
     <string name="applications_settings" msgid="1941993743933425622">"ઍપ્લિકેશનની માહિતી"</string>
-    <string name="applications_settings_summary" msgid="8206066893744768531">"ઍપ્લિકેશનો સંચાલિત કરો, ઝડપી લોંચ શોર્ટકટ્સ સેટ કરો"</string>
+    <string name="applications_settings_summary" msgid="8206066893744768531">"ઍપ મેનેજ કરો, ઝડપી લૉન્ચ શૉર્ટકટ સેટ કરો"</string>
     <string name="applications_settings_header" msgid="3154670675856048015">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="install_applications" msgid="3921609656584369901">"અજાણ્યા સ્ત્રોતો"</string>
     <string name="install_applications_title" msgid="7890233747559108106">"બધા ઍપ્લિકેશન સ્રોતોને મંજૂરી આપો"</string>
@@ -1946,7 +1937,7 @@
     <string name="reset_app_preferences_title" msgid="8935136792316050759">"ઍપ પસંદગીઓને રીસેટ કરીએ?"</string>
     <string name="reset_app_preferences_desc" msgid="6509978724602405805">"આમ કરવાથી આ બધી પસંદગીઓ રીસેટ થઈ જશે:\n\n"<li>"બંધ કરેલી ઍપ"</li>\n<li>"ઍપના બંધ કરેલાં નોટિફિકેશન"</li>\n<li>"ક્રિયાઓ માટેની ડિફૉલ્ટ ઍપ્લિકેશનો"</li>\n<li>"ઍપ માટે બૅકગ્રાઉન્ડ ડેટાના પ્રતિબંધો"</li>\n<li>"કોઈપણ પરવાનગીના પ્રતિબંધો"</li>\n\n"તમે કોઈપણ ઍપનો ડેટા ગુમાવશો નહીં."</string>
     <string name="reset_app_preferences_button" msgid="2591318711372850058">"ઍપ્લિકેશનો ફરીથી સેટ કરો"</string>
-    <string name="manage_space_text" msgid="9013414693633572277">"સ્થાન સંચાલિત કરો"</string>
+    <string name="manage_space_text" msgid="9013414693633572277">"સ્પેસ મેનેજ કરો"</string>
     <string name="filter" msgid="9039576690686251462">"ફિલ્ટર"</string>
     <string name="filter_dlg_title" msgid="3086282431958601338">"ફિલ્ટર વિકલ્પો પસંદ કરો"</string>
     <string name="filter_apps_all" msgid="5705421199299914620">"બધી ઍપ્લિકેશનો"</string>
@@ -2212,7 +2203,7 @@
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"લૉક સ્ક્રીનથી શૉર્ટકટ"</string>
     <string name="accessibility_shortcut_description" msgid="2184693606202133549">"સુવિધા માટેના શૉર્ટકટને લૉક સ્ક્રીન પરથી ચાલુ કરવાની મંજૂરી આપો. વૉલ્યૂમની બન્ને કીને થોડી સેકન્ડ સુધી દબાવી રાખો."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"ઉચ્ચ કોન્ટ્રાસ્ટ ટેક્સ્ટ"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"સ્ક્રીન વિસ્તૃતીકરણ આપમેળે અપડેટ કરો"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="4987009529235165664">"સ્ક્રીન મોટી કરવાનું ઑટોમૅટિક અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="9034532513972547720">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"મોટું માઉસ પોઇન્ટર"</string>
@@ -2500,7 +2491,7 @@
     <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"તમારી બધી ઍપ બૅટરીનો વપરાશ સામાન્ય પ્રમાણમાં કરી રહી છે. જો તે બૅટરીનો ઘણો વધુ વપરાશ કરવા માંડશે, તો તમારું ટૅબ્લેટ તમે શું ઍક્શન લઈ શકો તે સૂચવશે.\n\nજો તમારી પાસે બૅટરીમાં ચાર્જ ઓછો રહ્યો હોય, તો તમે કોઈપણ સમયે બૅટરી સેવર ચાલુ કરી શકો છો."</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"તમારી બધી ઍપ બૅટરીનો વપરાશ સામાન્ય પ્રમાણમાં કરી રહી છે. જો તે બૅટરીનો ઘણો વધુ વપરાશ કરવા માંડશે, તો તમારું ઉપકરણ તમે શું ઍક્શન લઈ શકો તે સૂચવશે.\n\nજો તમારી પાસે બૅટરીમાં ચાર્જ ઓછો રહ્યો હોય, તો તમે કોઈપણ સમયે બૅટરી સેવર ચાલુ કરી શકો છો."</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"બૅટરી મેનેજર"</string>
-    <string name="smart_battery_title" msgid="9095903608520254254">"ઍપને આપમેળે મેનેજ કરો"</string>
+    <string name="smart_battery_title" msgid="9095903608520254254">"ઍપને ઑટોમૅટિક રીતે મેનેજ કરો"</string>
     <string name="smart_battery_summary" product="default" msgid="1492277404000064998">"જે ઍપનો તમે ઓછો ઉપયોગ કરતા હો, તેના માટે બૅટરી મર્યાદિત કરો"</string>
     <string name="smart_battery_footer" msgid="8407121907452993645">"જ્યારે બૅટરી મેનેજર શોધે છે કે ઍપ બૅટરીનો અતિશય ઉપયોગ કરી રહી છે, ત્યારે તમારી પાસે આ ઍપને પ્રતિબંધિત કરવાનો વિકલ્પ હશે. પ્રતિબંધિત ઍપ યોગ્ય રીતે કાર્ય નહીં કરી શકે અને નોટિફિકેશન વિલંબિત થઈ શકે છે."</string>
     <string name="restricted_app_title" msgid="6585080822121007436">"પ્રતિબંધિત ઍપ"</string>
@@ -2519,10 +2510,8 @@
       <item quantity="other">%1$d ઍપ પ્રતિબંધિત છે</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"તમારું બૅટરી મીટર વાંચવામાં સમસ્યા આવી"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"તમારું બૅટરી મીટર વાંચવામાં સમસ્યા આવી. "<annotation id="url">"વધુ જાણવા"</annotation>" માટે ટૅપ કરો"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ઍપ્લિકેશન બંધ કરીએ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
@@ -2615,7 +2604,7 @@
     <string name="battery_detail_background" msgid="3333915023706228000">"પૃષ્ઠભૂમિમાં હોય ત્યારે"</string>
     <string name="battery_detail_power_usage" msgid="1492926471397355477">"બૅટરી વપરાશ"</string>
     <string name="battery_detail_info_title" msgid="5896661833554333683">"સંપૂર્ણ ચાર્જ પછી"</string>
-    <string name="battery_detail_manage_title" msgid="7910805419446927887">"બૅટરી વપરાશ સંચાલિત કરો"</string>
+    <string name="battery_detail_manage_title" msgid="7910805419446927887">"બૅટરી વપરાશ મેનેજ કરો"</string>
     <string name="advanced_battery_graph_subtext" msgid="6816737986172678550">"બાકી રહેલી બૅટરીનો અંદાજ ડિવાઇસના તમારા ઉપયોગ પર આધારિત છે"</string>
     <string name="estimated_time_left" msgid="948717045180211777">"અંદાજિત બાકી સમય"</string>
     <string name="estimated_charging_time_left" msgid="2287135413363961246">"સંપૂર્ણપણે ચાર્જ થવામાં"</string>
@@ -2627,7 +2616,7 @@
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"ઍપ્લિકેશન ઓપ્ટિમાઇઝેશન"</string>
     <string name="battery_saver" msgid="7737147344510595864">"બૅટરી સેવર"</string>
-    <string name="battery_saver_auto_title" msgid="6789753787070176144">"આપમેળે ચાલુ કરો"</string>
+    <string name="battery_saver_auto_title" msgid="6789753787070176144">"ઑટોમૅટિક રીતે ચાલુ કરો"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"કોઈ શેડ્યૂલ નથી"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"તમારા નિત્યક્રમ પર આધારિત"</string>
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"ટકાવારી પર આધારિત"</string>
@@ -2643,7 +2632,7 @@
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ચાલુ કરો"</string>
     <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"બૅટરી સેવરનો ઉપયોગ કરો"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"આપમેળે ચાલુ કરો"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"ઑટોમૅટિક રીતે ચાલુ કરો"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"ક્યારેય નહીં"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"<xliff:g id="PERCENT">%1$s</xliff:g> બૅટરી પર"</string>
     <string name="battery_percentage" msgid="1779934245963043490">"બૅટરીના ટકા"</string>
@@ -2750,7 +2739,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"વાઇ-ફાઇ પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"ડિવાઇસ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ અને કૉલ ઇતિહાસ) અને ઍપ ડેટા (જેમ કે સેટિંગ અને ઍપ દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી ઑટોમૅટિક રીતે બૅકઅપ લો.\n\nજ્યારે તમે ઑટોમૅટિક રીતે બૅકઅપ ચાલુ કરો છો, ત્યારે ડિવાઇસ અને ઍપ ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપએ સાચવ્યો હોય (ડેવલપર સેટિંગના આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"ઉપકરણ વ્યવસ્થાપક સેટિંગ્સ"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"ડિવાઇસ વ્યવસ્થાપક ઍપ્લિકેશન"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"આ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનને નિષ્ક્રિય કરો"</string>
@@ -2767,7 +2756,7 @@
     <string name="device_admin_status" msgid="6332571781623084064">"આ વ્યવસ્થાપક ઍપ્લિકેશન સક્રિય છે અને ઍપ્લિકેશન <xliff:g id="APP_NAME">%1$s</xliff:g>ને નીચેની ક્રિયાઓ કરવાની મંજૂરી આપે છે:"</string>
     <string name="profile_owner_add_title" msgid="2774489881662331549">"પ્રોફાઇલ સંચાલક સક્રિય કરીએ?"</string>
     <string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"નિરીક્ષણની મંજૂરી આપીએ?"</string>
-    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"આગળ વધવાથી, તમારા વપરાશકર્તાને તમારા વ્યવસ્થાપક દ્વારા સંચાલિત કરવામાં આવશે કે જેઓ વ્યક્તિગત ડેટા ઉપરાંત સંકળાયેલ ડેટાને પણ સંગ્રહિત કરી શકે છે.\n\nતમારા વ્યવસ્થાપક સેટિંગ્સ, ઍક્સેસ, ઍપ્લિકેશનો અને નેટવર્ક પ્રવૃત્તિ અને તમારા ઉપકરણની સ્થાન માહિતી સહિત, વપરાશકર્તાથી સંબંધિત ડેટાને મૉનિટર અને સંચાલિત કરી શકે છે."</string>
+    <string name="adding_profile_owner_warning" msgid="6868275476058020513">"આગળ વધવાથી, તમારા વપરાશકર્તાને તમારા વ્યવસ્થાપક દ્વારા મેનેજ કરવામાં આવશે કે જેઓ વ્યક્તિગત ડેટા ઉપરાંત સંકળાયેલ ડેટાને પણ સંગ્રહિત કરી શકે છે.\n\nતમારા વ્યવસ્થાપક સેટિંગ, ઍક્સેસ, ઍપ અને નેટવર્ક પ્રવૃત્તિ અને તમારા ડિવાઇસની સ્થાન માહિતી સહિત, વપરાશકર્તાથી સંબંધિત ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
     <string name="admin_disabled_other_options" msgid="8122039047419172139">"તમારા વ્યવસ્થાપકે અન્ય વિકલ્પો અક્ષમ કરેલા છે"</string>
     <string name="admin_more_details" msgid="6698424974827333973">"વધુ વિગતો"</string>
     <string name="notification_log_title" msgid="2812594935014664891">"નોટિફિકેશન લૉગ"</string>
@@ -2799,7 +2788,7 @@
     <string name="background_data_summary" msgid="6572245922513522466">"ઍપ્લિકેશનો કોઈપણ સમયે ડેટાને સમન્વયિત, મોકલી અને પ્રાપ્ત કરી શકે છે"</string>
     <string name="background_data_dialog_title" msgid="1692005302993229867">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરીએ?"</string>
     <string name="background_data_dialog_message" msgid="7760280837612824670">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરવું બૅટરીની આવરદા વધારે છે અને ડેટા ઉપયોગને ઓછો કરે છે. કેટલીક ઍપ્લિકેશનો હજી પણ બૅકગ્રાઉન્ડ ડેટા કનેક્શનનો ઉપયોગ કરતી હોઈ શકે છે."</string>
-    <string name="sync_automatically" msgid="4874122892765430304">"ઍપ્લિકેશન ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="sync_automatically" msgid="4874122892765430304">"ઍપ ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="sync_enabled" msgid="5794103781356455043">"સમન્વયન ચાલુ છે"</string>
     <string name="sync_disabled" msgid="1636223106968593391">"સમન્વયન બંધ છે"</string>
     <string name="sync_error" msgid="846923369794727644">"સમન્વયન ભૂલ"</string>
@@ -2827,7 +2816,7 @@
     <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"આ એકાઉન્ટને કાઢી નાખવાથી તેના બધા સંદેશા, સંપર્કો તેમજ ઉપકરણમાંનો અન્ય ડેટા ડિલીટ થઈ જશે!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"તમારા વ્યવસ્થાપકે આ ફેરફારની મંજૂરી આપી નથી"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"મેન્યુઅલી સમન્વયિત કરી શકાતું નથી"</string>
-    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"આ આઇટમ માટે સિંક હાલમાં અક્ષમ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને આપમેળે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
+    <string name="cant_sync_dialog_message" msgid="7612557105054568581">"આ આઇટમ માટે સિંક હાલમાં બંધ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને ઑટોમૅટિક રીતે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
     <string name="enter_password" msgid="6327051330258595331">"Android પ્રારંભ કરવા માટે, તમારો પાસવર્ડ દાખલ કરો"</string>
     <string name="enter_pin" msgid="1029287617551232681">"Android પ્રારંભ કરવા માટે, તમારો પિન દાખલ કરો"</string>
     <string name="enter_pattern" msgid="1747316785866742960">"Android પ્રારંભ કરવા માટે, તમારી પૅટર્ન દોરો"</string>
@@ -2859,10 +2848,10 @@
     <string name="data_usage_menu_show_ethernet" msgid="4401026240876938859">"ઇથરનેટ વપરાશ બતાવો"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="7792365022467586772">"ઇથરનેટ વપરાશ છુપાવો"</string>
     <string name="data_usage_menu_metered" msgid="4279260736172851951">"નેટવર્ક પ્રતિબંધ"</string>
-    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="data_usage_menu_auto_sync" msgid="2632694000068175025">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="data_usage_menu_sim_cards" msgid="8966135605336735887">"સિમ કાર્ડ"</string>
     <string name="data_usage_cellular_data_summary" msgid="8139993171126153316">"થોભાવવાની મર્યાદા"</string>
-    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"ડેટાને આપમેળે સિંક કરો"</string>
+    <string name="account_settings_menu_auto_sync" msgid="1660484779001900562">"ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="2905595464540145671">"વ્યક્તિગત ડેટાને ઑટો સિંક કરો"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="8561102487795657789">"ઑફિસના ડેટાને ઑટો સિંક કરો"</string>
     <string name="data_usage_change_cycle" msgid="4501026427365283899">"ચક્ર બદલો…"</string>
@@ -3055,8 +3044,8 @@
     <string name="user_admin" msgid="4024553191395768119">"એડમિન"</string>
     <string name="user_you" msgid="3070562015202859996">"તમે (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"તમે <xliff:g id="USER_COUNT">%1$d</xliff:g> જેટલા વપરાશકર્તાઓ ઉમેરી શકો છો"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"માત્ર ટેબ્લેટના માલિક વપરાશકર્તાને સંચાલિત કરી શકે છે."</string>
-    <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"માત્ર ફોનના માલિક વપરાશકર્તાને સંચાલિત કરી શકે છે."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"માત્ર ટૅબ્લેટના માલિક વપરાશકર્તાને મેનેજ કરી શકે છે."</string>
+    <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"માત્ર ફોનના માલિક વપરાશકર્તાને મેનેજ કરી શકે છે."</string>
     <string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"પ્રતિબંધિત પ્રોફાઇલ્સ એકાઉન્ટ્સ ઉમેરી શકતી નથી"</string>
     <string name="user_remove_user_menu" msgid="2183714948094429367">"આ ઉપકરણમાંથી <xliff:g id="USER_NAME">%1$s</xliff:g> ને કાઢી નાખો"</string>
     <string name="user_lockscreen_settings" msgid="4596612658981942092">"લૉક સ્ક્રીન સેટિંગ્સ"</string>
@@ -3125,7 +3114,7 @@
     <string name="amber_alerts_summary" msgid="5755221775246075883">"બાળકના અપહરણો વિશે બુલેટિન્સ પ્રાપ્ત કરો"</string>
     <string name="repeat_title" msgid="8676570486899483606">"પુનરાવર્તન"</string>
     <string name="call_manager_enable_title" msgid="1214301265395158720">"કૉલ સંચાલક સક્ષમ કરો"</string>
-    <string name="call_manager_enable_summary" msgid="7362506369604163030">"આ સેવાને તમારા કૉલ્સ કેવી રીતે કરવામાં આવે તે સંચાલિત કરવાની મંજૂરી આપો."</string>
+    <string name="call_manager_enable_summary" msgid="7362506369604163030">"આ સેવાને તમારા કૉલ કેવી રીતે કરવામાં આવે તે મેનેજ કરવાની મંજૂરી આપો."</string>
     <string name="call_manager_title" msgid="3397433159509629466">"કૉલ સંચાલક"</string>
     <!-- no translation found for call_manager_summary (2558839230880919191) -->
     <skip />
@@ -3287,7 +3276,7 @@
     <string name="keywords_lockscreen" msgid="3656926961043485797">"અનલૉક કરવા માટે સ્લાઇડ કરો, પાસવર્ડ, પૅટર્ન, પિન"</string>
     <string name="keywords_app_pinning" msgid="1564144561464945019">"સ્ક્રીન પિનિંગ"</string>
     <string name="keywords_profile_challenge" msgid="5135555521652143612">"કાર્ય પડકાર, કાર્ય, પ્રોફાઇલ"</string>
-    <string name="keywords_unification" msgid="2677472004971453468">"કાર્યાલયની પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
+    <string name="keywords_unification" msgid="2677472004971453468">"કાર્યાલયની પ્રોફાઇલ, મેનેજ થયેલ પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
     <string name="keywords_gesture" msgid="3456930847450080520">"સંકેતો"</string>
     <string name="keywords_cards_passes" msgid="4798102029412153067">"કાર્ડ, પાસ"</string>
     <string name="keywords_device_controls" msgid="8962494082504033651">"ડિવાઇસનાં નિયંત્રણો, નિયંત્રણો"</string>
@@ -3366,7 +3355,7 @@
     <string name="emergency_tone_vibrate" msgid="6282296789406984698">"વાઇબ્રેશન"</string>
     <string name="boot_sounds_title" msgid="5033062848948884111">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"લાઇવ કૅપ્શન"</string>
-    <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન આપમેળે ઉમેરો"</string>
+    <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન ઑટોમૅટિક રીતે ઉમેરો"</string>
     <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{એકપણ નહીં}=1{એક શેડ્યૂલ સેટ કરવામાં આવ્યું}one{# શેડ્યૂલ સેટ કરવામાં આવ્યું}other{# શેડ્યૂલ સેટ કરવામાં આવ્યા}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ખલેલ પાડશો નહીં"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ફક્ત મહત્વપૂર્ણ લોકો અને ઍપ દ્વારા નોટિફિકેશન મેળવો"</string>
@@ -3428,8 +3417,8 @@
     <string name="zen_mode_button_turn_off" msgid="2060862413234857296">"હમણાં બંધ કરો"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8251503918238985549">"ખલેલ પાડશો નહીં મોડ <xliff:g id="FORMATTED_TIME">%s</xliff:g> સુધી ચાલુ છે"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"ખલેલ પાડશો નહીં મોડને તમે જ્યાં સુધી બંધ નહીં કરો ત્યાં સુધી તે ચાલુ રહેશે."</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"ખલેલ પાડશો નહીં મોડ શેડ્યૂલ (<xliff:g id="RULE_NAME">%s</xliff:g>) નિયમ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યો હતો"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યું હતું"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"\'ખલેલ પાડશો નહીં\' મોડ શેડ્યૂલ (<xliff:g id="RULE_NAME">%s</xliff:g>) નિયમ દ્વારા ઑટોમૅટિક રીતે ચાલુ કરવામાં આવ્યો હતો"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"\'ખલેલ પાડશો નહીં\' મોડ એક <xliff:g id="APP_NAME">%s</xliff:g> ઍપ દ્વારા ઑટોમૅટિક રીતે ચાલુ કરવામાં આવ્યું હતું"</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"કસ્ટમ સેટિંગ સાથે ખલેલ પાડશો નહીંની સુવિધા <xliff:g id="RULE_NAMES">%s</xliff:g> માટે ચાલુ છે."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="2310353944697868606"><annotation id="link">" કસ્ટમ સેટિંગ જુઓ"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"માત્ર પ્રાધાન્યતા"</string>
@@ -3585,15 +3574,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"પ્રાધાન્યવાળી વાતચીત"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"વાતચીત વિભાગની ટોચ પર અને ફ્લોટિંગ બબલ તરીકે બતાવો"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"વાતચીત વિભાગની ટોચ પર બતાવો"</string>
-    <!-- no translation found for other_conversations (551178916855139870) -->
-    <skip />
+    <string name="other_conversations" msgid="551178916855139870">"ગૌણ વાતચીતો"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"તમે જેમાં ફેરફારો કર્યા છે તેવી વાતચીતો"</string>
-    <!-- no translation found for recent_conversations (471678228756995274) -->
-    <skip />
-    <!-- no translation found for conversation_settings_clear_recents (7502738708058226585) -->
-    <skip />
-    <!-- no translation found for clear (5092178335409471100) -->
-    <skip />
+    <string name="recent_conversations" msgid="471678228756995274">"તાજેતરની વાતચીતો"</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>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"પ્રાધાન્યતા ધરાવતી અને ફેરફાર કરેલી વાતચીતો અહીં દેખાશે"</string>
@@ -3747,13 +3732,13 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"<xliff:g id="RULE">%1$s</xliff:g> નિયમ કાઢી નાખીએ?"</string>
     <string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"ડિલીટ કરો"</string>
     <string name="zen_mode_rule_type_unknown" msgid="7819162569994282316">"અજાણ્યું"</string>
-    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. આ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ઍપએ આપમેળે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. એક ઍપએ આપમેળે ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
+    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. આ (<xliff:g id="APP_NAME">%1$s</xliff:g>) ઍપએ ઑટોમૅટિક રીતે \'ખલેલ પાડશો નહીં\' મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"આ સેટિંગ હમણાં બદલી શકાશે નહીં. એક ઍપએ ઑટોમૅટિક રીતે \'ખલેલ પાડશો નહીં\' મોડ કસ્ટમ વર્તન સાથે ચાલુ કર્યું છે."</string>
     <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"આ સેટિંગ હમણાં જ બદલી શકાશે નહીં. ખલેલ પાડશો નહીં મોડ કસ્ટમ વર્તન સાથે મેન્યુઅલી ચાલુ કરવામાં આવ્યું હતું."</string>
     <string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"સમય"</string>
-    <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"ઉલ્લેખિત સમય દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે આપમેળે નિયમ સેટ કર્યો"</string>
+    <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"ઉલ્લેખિત સમય દરમિયાન \'ખલેલ પાડશો નહીં\' ચાલુ કરવા માટે ઑટોમૅટિક રીતે નિયમ સેટ કર્યો"</string>
     <string name="zen_event_rule_type_name" msgid="1921166617081971754">"ઇવેન્ટ"</string>
-    <string name="zen_event_rule_enabled_toast" msgid="4943723266121388395">"ઉલ્લેખિત ઇવેન્ટ્સ દરમિયાન ખલેલ પાડશો નહીં ચાલુ કરવા માટે આપમેળે નિયમ સેટ કર્યો"</string>
+    <string name="zen_event_rule_enabled_toast" msgid="4943723266121388395">"ઉલ્લેખિત ઇવેન્ટ દરમિયાન \'ખલેલ પાડશો નહીં\' ચાલુ કરવા માટે ઑટોમૅટિક રીતે નિયમ સેટ કર્યો"</string>
     <string name="zen_mode_event_rule_calendar" msgid="6279460374929508907">"આ માટેની ઇવેન્ટ્સ દરમિયાન"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="3065013489987409864">"<xliff:g id="CALENDAR">%1$s</xliff:g> માટેની ઇવેન્ટ્સ દરમિયાન"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="8395450413356855311">"કોઈપણ કૅલેન્ડર"</string>
@@ -3861,7 +3846,7 @@
     <string name="zen_mode_calls_summary_two" msgid="6351563496898410742">"<xliff:g id="CALLER_TYPE_0">%1$s</xliff:g> અને <xliff:g id="CALLER_TYPE_1">%2$s</xliff:g>"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="4121054819936083025">"જો <xliff:g id="MINUTES">%d</xliff:g>-મિનિટના સમયગાળા દરમ્યાન તે જ વ્યક્તિ ફરીથી કૉલ કરે તો"</string>
     <string name="zen_mode_behavior_summary_custom" msgid="3126805555852783860">"કસ્ટમ"</string>
-    <string name="zen_mode_when" msgid="5710214762051824755">"આપમેળે ચાલુ"</string>
+    <string name="zen_mode_when" msgid="5710214762051824755">"ઑટોમૅટિક રીતે ચાલુ"</string>
     <string name="zen_mode_when_never" msgid="2537537280091840672">"ક્યારેય નહીં"</string>
     <string name="zen_mode_when_every_night" msgid="9018738747936038166">"દર રાત્રે"</string>
     <string name="zen_mode_when_weeknights" msgid="531342225633264368">"સપ્તાહાંત સિવાયની રાત્રે"</string>
@@ -3901,8 +3886,8 @@
     <string name="screen_pinning_unlock_none" msgid="2474959642431856316">"ઉપકરણને અનપિન કરતી વખતે લૉક કરો"</string>
     <string name="confirm_sim_deletion_title" msgid="9199369003530237871">"સિમ કાર્ડને ડિલીટ કરવાનું કન્ફર્મ કરો"</string>
     <string name="confirm_sim_deletion_description" msgid="8937609409607338516">"ડાઉનલોડ કરેલા સિમ કાર્ડને કાઢી નાખતા પહેલાં ચકાસણી કરો કે આ તમે જ છો"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"આ કાર્યાલયની પ્રોફાઇલ આમના દ્વારા સંચાલિત થાય છે:"</string>
-    <string name="managing_admin" msgid="2633920317425356619">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા સંચાલિત"</string>
+    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2951348192319498135">"આ કાર્યાલયની પ્રોફાઇલ આમના દ્વારા મેનેજ થાય છે:"</string>
+    <string name="managing_admin" msgid="2633920317425356619">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા મેનેજ થયેલ"</string>
     <string name="experimental_preference" msgid="869354050717870055">"(પ્રાયોગિક)"</string>
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"સુરક્ષિત પ્રારંભ"</string>
     <string name="encryption_continue_button" msgid="3591796237625134622">"ચાલુ રાખો"</string>
@@ -4141,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પહોંચાડશો નહિ ની એક્સેસ રદબાતલ કરીએ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"આ ઍપ્લિકેશન દ્વારા બનાવાયેલ તમામ ખલેલ પહોંચાડશો નહિ નિયમો દૂર કરવામાં આવશે."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ઓપ્ટિમાઇઝ કરશો નહીં"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ઓપ્ટિમાઇઝ કરો"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"તમારી બૅટરી વધુ ઝડપથી ખાલી થઈ શકે છે. ઍપ હવે બૅકગ્રાઉન્ડ બૅટરીનો ઉપયોગ કરવાથી પ્રતિબંધિત રહેશે નહીં."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"બહેતર બૅટરી આવરદા માટે ભલામણ કરેલ"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"બૅટરી ઓપ્ટિમાઇઝેશન્સને અવગણવા માટે <xliff:g id="APP">%s</xliff:g> ને મંજૂરી આપીએ?"</string>
@@ -4232,8 +4217,8 @@
     <string name="default_admin_support_msg" msgid="8338570262037182531">"જો તમને કોઈ પ્રશ્ન હોય, તો તમારા IT વ્યવસ્થાપકનો સંપર્ક કરો"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"વધુ વિગતો"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત તમારી કાર્યાલયની પ્રોફાઇલ સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાનું નિયમન અને સંચાલન કરી શકે છે."</string>
-    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત આ વપરાશકર્તા સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાને મૉનિટર અને સંચાલિત કરી શકે છે."</string>
-    <string name="admin_device_owner_message" msgid="5503131744126520590">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત આ ઉપકરણ સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાને મૉનિટર અને સંચાલિત કરી શકે છે."</string>
+    <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"તમારા વ્યવસ્થાપક સેટિંગ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ડિવાઇસની સ્થાન માહિતી સહિત આ વપરાશકર્તા સાથે સંકળાયેલ ઍપ અને ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
+    <string name="admin_device_owner_message" msgid="5503131744126520590">"તમારા વ્યવસ્થાપક સેટિંગ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ડિવાઇસની સ્થાન માહિતી સહિત આ ડિવાઇસ સાથે સંકળાયેલ ઍપ અને ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
     <string name="condition_turn_off" msgid="402707350778441939">"બંધ કરો"</string>
     <string name="condition_turn_on" msgid="3911077299444314791">"ચાલુ કરો"</string>
     <string name="condition_expand_show" msgid="1501084007540953213">"બતાવો"</string>
@@ -4258,7 +4243,7 @@
     <string name="condition_device_vibrate_title" msgid="9058943409545158583">"માત્ર વાઇબ્રેશન"</string>
     <string name="condition_device_vibrate_summary" msgid="7537724181691903202">"કૉલ અને નોટિફિકેશન માટે"</string>
     <string name="night_display_suggestion_title" msgid="5418911386429667704">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
-    <string name="night_display_suggestion_summary" msgid="4218017907425509769">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા આપમેળે ઓછીવધતી કરો"</string>
+    <string name="night_display_suggestion_summary" msgid="4218017907425509769">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા ઑટોમૅટિક રીતે ઓછીવધતી કરો"</string>
     <string name="condition_night_display_title" msgid="1072880897812554421">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
     <string name="condition_night_display_summary" msgid="3278349775875166984">"સ્ક્રીન પર પીળાશ પડતી નારંગી રંગની છટા"</string>
     <string name="condition_grayscale_title" msgid="9029271080007984542">"ગ્રેસ્કેલ"</string>
@@ -4513,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ટૅબ્લેટ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ડિવાઇસ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર ટૅપ કરો."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"પૅનિક બટન"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> દ્વારા મેનેજ કરાય છે"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ઝડપથી 5 વાર પાવર બટન દબાવીને ઇમર્જન્સી SOS ક્રિયાઓ શરૂ કરો."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ચેતવણીનો સાઉન્ડ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ક્રિયાઓ શરૂ કરતા પહેલાંની અલર્ટ"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"નોટિફિકેશનો માટે ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"તમારા નોટિફિકેશનને જોવા માટે, તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
@@ -4537,20 +4527,20 @@
     <string name="web_action_section_title" msgid="994717569424234098">"ઝટપટ ઍપ્લિકેશનો"</string>
     <string name="instant_apps_settings" msgid="4280942494969957858">"ઝટપટ ઍપ પસંદગીઓ"</string>
     <string name="domain_url_section_title" msgid="9028890472923474958">"ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનો"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ સંચાલક દ્વારા સંચાલિત કરવામાં આવી રહ્યું છે"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"તમારું સ્ટોરેજ, હવે સ્ટોરેજ મેનેજર દ્વારા મેનેજ કરવામાં આવી રહ્યું છે"</string>
     <string name="account_for_section_header" msgid="7466759342105251096">"<xliff:g id="USER_NAME">%1$s</xliff:g> માટેના એકાઉન્ટ"</string>
     <string name="configure_section_header" msgid="3126887329521705210">"ગોઠવો"</string>
     <string name="auto_sync_account_title" msgid="1070908045600374254">"ઍપના ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
-    <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"વ્યક્તિગત ડેટાનું આપમેળે સમન્વયન કરો"</string>
-    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"કાર્ય ડેટાનું આપમેળે સમન્વયન કરો"</string>
+    <string name="auto_sync_personal_account_title" msgid="3544275021920818595">"વ્યક્તિગત ડેટાને ઑટોમૅટિક રીતે સિંક કરો"</string>
+    <string name="auto_sync_work_account_title" msgid="6060310415978781885">"કાર્ય ડેટા ઑટોમૅટિક રીતે સિંક કરો"</string>
     <string name="auto_sync_account_summary" msgid="7580352130028957346">"ઍપને ઑટોમૅટિક રીતે ડેટાને રિફ્રેશ કરવા દો"</string>
     <string name="account_sync_title" msgid="7036067017433297574">"એકાઉન્ટ સિંક"</string>
     <string name="account_sync_summary_some_on" msgid="911460286297968724">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> આઇટમ માટે સમન્વયન ચાલુ છે"</string>
     <string name="account_sync_summary_all_on" msgid="2953682111836599841">"બધી આઇટમ માટે સમન્વયન ચાલુ છે"</string>
     <string name="account_sync_summary_all_off" msgid="6378301874540507884">"બધી આઇટમ માટે સમન્વયન બંધ છે"</string>
-    <string name="enterprise_privacy_settings" msgid="786350385374794180">"સંચાલિત ઉપકરણની માહિતી"</string>
-    <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"ફેરફારો અને સેટિંગ્સ તમારી સંસ્થા દ્વારા સંચાલિત કરવામાં આવે છે"</string>
-    <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"ફેરફારો અને સેટિંગ્સ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા સંચાલિત કરવામાં આવે છે"</string>
+    <string name="enterprise_privacy_settings" msgid="786350385374794180">"મેનેજ થયેલ ડિવાઇસની માહિતી"</string>
+    <string name="enterprise_privacy_settings_summary_generic" msgid="5471858290610344646">"ફેરફારો અને સેટિંગ તમારી સંસ્થા દ્વારા મેનેજ કરવામાં આવે છે"</string>
+    <string name="enterprise_privacy_settings_summary_with_name" msgid="1315413275836515937">"ફેરફારો અને સેટિંગ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા મેનેજ કરવામાં આવે છે"</string>
     <string name="enterprise_privacy_header" msgid="4626225398848641603">"તમારા કાર્ય ડેટાની ઍક્સેસ પ્રદાન કરવા માટે, તમારી સંસ્થા સેટિંગ્સમાં ફેરફાર કરી શકે છે અને તમારા ઉપકરણમાં સૉફ્ટવેર ઇન્સ્ટૉલ કરી શકે છે.\n\nવધુ વિગતો માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
     <string name="enterprise_privacy_exposure_category" msgid="2507761423540037308">"તમારી સંસ્થા જોઈ શકે તે માહિતીના પ્રકારો"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="5459989751333816587">"તમારી સંસ્થાના વ્યવસ્થાપક દ્વારા કરવામાં આવેલા ફેરફારો"</string>
@@ -4597,7 +4587,7 @@
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> પ્રયાસ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> પ્રયાસ</item>
     </plurals>
-    <string name="do_disclosure_generic" msgid="3067459392402324538">"આ ઉપકરણ તમારી સંસ્થા દ્વારા સંચાલિત થાય છે."</string>
+    <string name="do_disclosure_generic" msgid="3067459392402324538">"આ ડિવાઇસ તમારી સંસ્થા દ્વારા મેનેજ થાય છે."</string>
     <string name="do_disclosure_with_name" msgid="867544298924410766">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
     <string name="do_disclosure_learn_more_separator" msgid="5714364437437041671">" "</string>
     <string name="learn_more" msgid="3534519107947510952">"વધુ જાણો"</string>
@@ -4636,13 +4626,13 @@
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"સ્વતઃભરણ સેવા"</string>
     <string name="autofill_keywords" msgid="6260653325195017912">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
-    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપ્લિકેશનનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google આપમેળે&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે આપમેળે શું દાખલ થશે."</string>
-    <string name="debug_autofill_category" msgid="5998163555428196185">"આપમેળે ભરવાની સેટિંગ"</string>
+    <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ઑટોમૅટિક રીતે ભરવાની સુવિધા&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે ઑટોમૅટિક રીતે શું દાખલ થશે."</string>
+    <string name="debug_autofill_category" msgid="5998163555428196185">"ઑટોમૅટિક રીતે ભરવાના સેટિંગ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"લૉગિંગનું સ્તર"</string>
     <string name="autofill_max_partitions" msgid="7342195529574406366">"સત્ર દીઠ મહત્તમ વિનંતીઓ"</string>
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"જોઈ શકાતા મહત્તમ ડેટાસેટની સંખ્યા"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ડિફૉલ્ટ મૂલ્યો પર રીસેટ કરો"</string>
-    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"આપમેળે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
+    <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ઑટોમૅટિક રીતે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
     <string name="device_theme" msgid="5027604586494772471">"ઉપકરણની થીમ"</string>
     <string name="default_theme" msgid="4815428567082263639">"ડિફૉલ્ટ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"નેટવર્કનું નામ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c78fa23..f4f8a34 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1736,7 +1736,7 @@
     <string name="managed_profile_location_services" msgid="8172092734138341880">"दफ़्तर के लिए, जगह की जानकारी से जुड़ी सेवाएं."</string>
     <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
     <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"मौजूदा समय क्षेत्र की पहचान करने के लिए, डिवाइस की जगह की जानकारी का इस्तेमाल करने देता है. जगह की जानकारी की दूसरी सेटिंग, (जैसे कि वाई-फ़ाई स्कैन करना) समय क्षेत्र की सटीक पहचान करने पर असर डाल सकती है."</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"मौजूदा समय क्षेत्र की पहचान करने के लिए, डिवाइस की जगह की जानकारी का इस्तेमाल करने देता है. जगह की जानकारी की दूसरी सेटिंग, समय क्षेत्र की सटीक पहचान करने पर असर डाल सकती है. जैसे कि वाई-फ़ाई स्कैन करना."</string>
     <string name="location_time_zone_detection_on" msgid="5514817179120761597">"चालू है"</string>
     <string name="location_time_zone_detection_off" msgid="192427076195667079">"बंद है"</string>
     <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"समय क्षेत्र की अपने-आप पहचान करने की सुविधा बंद है"</string>
@@ -2511,7 +2511,7 @@
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
     <string name="battery_missing_message" msgid="5202575301365811053">"आपके डिवाइस के बैटरी मीटर की रीडिंग लेने में समस्या आ रही है"</string>
-    <string name="battery_missing_help_message" msgid="4583322687535428926">"आपके डिवाइस के बैटरी मीटर की रीडिंग लेने में समस्या आ रही है. टैप करके, इस बारे में "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"आपके डिवाइस के बैटरी मीटर की रीडिंग लेने में समस्या आ रही है. इस बारे में "<annotation id="url">"ज़्यादा जानने के लिए"</annotation>"टैप करें"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ऐप्लिकेशन रोकना चाहते हैं?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"आपका फ़ोन बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"आपका टैबलेट बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"टैबलेट की स्क्रीन पर टैप करके देखें कि सूचना मिली है या नहीं"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"डिवाइस की स्क्रीन पर टैप करके देखें कि सूचना मिली है या नहीं"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचनाएं, और दूसरी जानकारी देखने के लिए फ़ोन की स्क्रीन पर टैप करें."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"खतरे के अलार्म वाला बटन"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> प्रबंधित करता है"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"आपातकालीन स्थिति में जगह की जानकारी शेयर करने के लिए, पावर बटन को पांच बार तेज़ी से दबाएं."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"चेतावनी की आवाज़"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"आपातकालीन सेवाओं को कॉल करने से पहले चेतावनी जारी करें"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"आपातकालीन एसओएस चेतावनी"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> प्रबंधित करता है"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"आपातकालीन सेवाओं को कॉल करने के लिए, पावर बटन को पांच बार तेज़ी से दबाएं."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"चेतावनी की आवाज़"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"आपातकालीन सेवाओं को कॉल करने से पहले चेतावनी जारी करें"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाओं के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अपनी सूचनाएं देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b1f75b0..3aa5598 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1764,7 +1764,7 @@
     <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko je otkrivanje vremenske zone onemogućeno"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Onemogućeno je otkrivanje vremenske zone lokacije"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Nije podržano otkrivanje vremenske zone lokacije"</string>
-    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Izmjene otkrivanje vremenske zone lokacije nisu dopuštene"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Izmjene značajke otkrivanja vremenske zone lokacije nisu dopuštene"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokacija Wi-Fi i mob. mreža"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokacija utvrđena pomoću Wi-Fija"</string>
@@ -4571,11 +4571,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da biste provjerili uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da biste pogledali vrijeme, obavijesti i druge informacije, dodirnite zaslon."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Gumb za uzbunu"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Brzo 5 puta pritisnite tipku za uključivanje/isključivanje da biste pokrenuli hitne SOS radnje."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozorenja"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozorenje prije pokretanja radnji"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS upozorenje"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Brzo 5 puta pritisnite tipku za uključivanje/isključivanje da biste pokrenuli hitne SOS radnje."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Zvuk upozorenja"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Upozorenje prije pokretanja radnji"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prelazak prstom preko senzora za obavijesti"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prelazak prstom preko senzora"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index be52ec5..2aeb17f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Koppintson a táblagép megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Koppintson az eszköz megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson a képernyőre."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Pánik gomb"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Kezelő: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"A bekapcsológombot egymás után gyorsan ötször lenyomva vészhelyzeti műveleteket kezdeményezhet."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Figyelmeztetés hangja"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Értesítés a műveletek indítása előtt"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Vészhelyzet – SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Kezelő: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"A bekapcsológombot egymás után gyorsan ötször lenyomva vészhelyzeti műveleteket kezdeményezhet."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Figyelmeztetés hangja"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Értesítés a műveletek indítása előtt"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Értesítések ujjlenyomattal"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Ujjlenyomat csúsztatása"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 74b4689..ac33d6f 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Հպեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Հպեք՝ սարքը ստուգելու համար"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ժամը, ծանուցումները և այլ տեղեկություններ տեսնելու համար կրկնակի հպեք էկրանին:"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Խուճապային ազդանշանի կոճակ"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Կառավարվում է «<xliff:g id="APP_NAME">%1$s</xliff:g>» հավելվածի միջոցով"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Արտակարգ իրավիճակներում գործարկեք SOS գործողությունները՝ սնուցման կոճակը 5 անգամ արագ սեղմելով։"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Նախազգուշացնող ազդանշան"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Զգուշացնել նախքան գործողությունները սկսելը"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Արտակարգ իրավիճակի SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Ադմինիստրատոր՝ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Արտակարգ իրավիճակներում գործարկեք SOS գործողությունները՝ սնուցման կոճակը 5 անգամ արագ սեղմելով։"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Նախազգուշացնող ազդանշան"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Զգուշացնել նախքան գործողությունները սկսելը"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Մատնահետքերի սկաներ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c843f76..0564a98 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ketuk untuk memeriksa tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ketuk untuk memeriksa perangkat"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ketuk layar Anda."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Tombol panik"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Dikelola oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Mulai tindakan SOS darurat dengan menekan cepat tombol daya sebanyak 5 kali."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Suara peringatan"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Memberi peringatan sebelum mengambil tindakan"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS Darurat"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Dikelola oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Mulai tindakan SOS darurat dengan menekan cepat tombol daya sebanyak 5 kali."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Suara peringatan"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Beri peringatan sebelum melakukan tindakan"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Usapkan sidik jari untuk melihat notifikasi"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usapkan sidik jari"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Untuk memeriksa notifikasi, usapkan jari ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 9b32cde..766e311 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ýttu til að athuga spjaldtölvu"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ýttu til að athuga tæki"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu ýta á skjáinn."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Neyðarhnappur"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Stýrt af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Ræstu neyðaraðgerð með því að ýta snöggt á aflrofann fimm sinnum."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Viðvörunarhljóð"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Sýna viðvörun áður en aðgerðir eru hafnar"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Neyðartilkynning"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Stýrt af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Ræstu neyðaraðgerð með því að ýta snöggt á aflrofann 5 sinnum."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Viðvörunarhljóð"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Spila viðvörun áður en aðgerðir hefjast"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Fingrafar til að opna tilkynningar"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Lesa fingrafar"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1b82a6f..a7dde3d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocca per selezionare le notifiche"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocca per selezionare il dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Per controllare l\'ora, le notifiche e altre informazioni, tocca lo schermo."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Pulsante di emergenza"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Funzionalità gestita dall\'app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Avvia le azioni SOS di emergenza premendo rapidamente per 5 volte il tasto di accensione."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Suono di avviso"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Avvisa prima di iniziare le azioni"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS di emergenza"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Funzionalità gestita dall\'app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Avvia le azioni SOS di emergenza premendo rapidamente per 5 volte il tasto di accensione."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Suono di avviso"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Avvisa prima di iniziare le azioni"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Usa l\'impronta per le notifiche"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usa l\'impronta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte sul retro del telefono."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e9f9c16..1e1fca0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"הקשה לבדיקת הטאבלט"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"הקשה לבדיקת המכשיר"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"כדי להתעדכן מה השעה, לבדוק התראות ולהציג מידע נוסף, צריך להקיש על המסך."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"לחצן מצוקה"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"התכונה מנוהלת על ידי <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"כדי להפעיל את הפעולות למקרה חירום, יש ללחוץ על לחצן ההפעלה 5 פעמים במהירות."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"צליל אזהרה"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"תתקבל התראה לפני שהפעולות יתחילו"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"מקרה חירום"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"מנוהל על ידי <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"כדי להפעיל את הפעולות למקרה חירום, יש ללחוץ על לחצן ההפעלה 5 פעמים במהירות."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"צליל אזהרה"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"תתקבל התראה לפני שהפעולות יתחילו"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"החלקת טביעת אצבע לקריאת התראות"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"החלקה של טביעת אצבע"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"כדי לבדוק התראות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0eeaa90..af7ef06 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"タブレットをタップしてチェックする"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"デバイスをタップしてチェックする"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"時刻、通知などの情報を確認するには、画面をタップします。"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"パニックボタン"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> が管理しています。"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"電源ボタンを 5 回すばやく押すと、SOS 緊急アクションが実行されます。"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警告音"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"アクション実行前のアラート"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS 緊急通報"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g>によって管理されています"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"電源ボタンを 5 回すばやく押すと、SOS 緊急アクションが実行されます。"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"警告音"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"アクション実行前のアラート"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"指紋センサーをスワイプして通知を表示"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"指紋センサーのスワイプ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"スマートフォンの背面にある指紋認証センサーを下にスワイプして、通知を確認できます。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 434b0c0..35238ae 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2180,7 +2180,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"მარტივი წვდომის ფუნქციით სარგებლობისთვის 2 თითით გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ.\n\nფუნქციების გადასართავად 2 თითით გადაფურცლეთ ზემოთ და დააყოვნეთ."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"მარტივი წვდომის ფუნქციით სარგებლობისთვის 3 თითით გადაფურცლეთ ეკრანის ქვედა კიდიდან ზემოთ.\n\nფუნქციების გადასართავად 3 თითით გადაფურცლეთ ზემოთ და დააყოვნეთ."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"გასაგებია"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g>-ის მალსახმობი"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"<xliff:g id="SERVICE">%1$s</xliff:g>ს მალსახმობი"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"მარტივი წვდომის ღილაკი"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"გადაფურცლეთ ზემოთ 2 თითით"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"გადაფურცლეთ ზემოთ 3 თითით"</string>
@@ -2224,7 +2224,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"შეხება და დაყოვნება"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"ფერის ინვერსია"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"ფერთა ინვერსიის გამოყენება"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"ფერთა ინვერსია ნათელ ეკრანებს მუქს ხდის.&lt;br/&gt;&lt;br/&gt; Note: &lt;ol&gt; &lt;li&gt; ფერთა ინვერსია ასევე მოქმედებს მუქ ეკრანებზე და მათ ნათელს ხდის.&lt;/li&gt; &lt;li&gt; ამით ფერები შეიცვლება მედია-კონტენტსა და სურათებში.&lt;/li&gt; &lt;li&gt; მუქი თემა გამოიყენება მუქი ფონის საჩვენებლად. მუქი თემა მუშაობს მხარდაჭერილ აპებში. ფერთა ინვერსია ყველა აპში მუშაობს.&lt;/li&gt; &lt;/ol&gt;"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="6955835010409034745">"ფერთა ინვერსია ნათელ ეკრანებს მუქს ხდის.&lt;br/&gt;&lt;br/&gt; შენიშვნა: &lt;ol&gt; &lt;li&gt; ფერთა ინვერსია ასევე მოქმედებს მუქ ეკრანებზე და მათ ნათელს ხდის.&lt;/li&gt; &lt;li&gt; ამით ფერები შეიცვლება მედია-კონტენტსა და სურათებში.&lt;/li&gt; &lt;li&gt; მუქი თემა გამოიყენება მუქი ფონის საჩვენებლად. მუქი თემა მუშაობს მხარდაჭერილ აპებში. ფერთა ინვერსია ყველა აპში მუშაობს.&lt;/li&gt; &lt;/ol&gt;"</string>
     <string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"ავტომატური დაწკაპუნება (გაყინვის დრო)"</string>
     <string name="accessibility_autoclick_description" msgid="6827042379062255307">"ავტომატური დაწკაპუნება მუშაობს დაკავშირებული მაუსით. თქვენ შეგიძლიათ დააყენოთ მაუსის კურსორი ისე, რომ ავტომატურად დააწკაპუნოს, როდესაც კურსორი მოძრაობას შეწყვეტს გარკვეული დროით."</string>
     <string name="accessibility_autoclick_default_title" msgid="752429113115293087">"გამორთვა"</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"შეეხეთ ტაბლეტის შესამოწმებლად"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"შეეხეთ მოწყობილობას შესამოწმებლად"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად შეეხეთ ეკრანს."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"პანიკის ღილაკი"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"მართავს <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"დაიწყეთ საგანგებო SOS მოქმედებები ჩართვის ღილაკზე სწრაფად 5-ჯერ დაჭერით."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"გამაფრთხილებელი ხმა"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"გაფრთხილება მოქმედებების დაწყებამდე"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"საგანგებო SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"მართავს <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"დაიწყეთ საგანგებო SOS მოქმედებები ჩართვის ღილაკზე სწრაფად 5-ჯერ დაჭერით."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"გამაფრთხილებელი ხმა"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"გაფრთხილება მოქმედებების დაწყებამდე"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"თითის ანაბეჭდით გადაფურცვლა შეტყობინებების შესამოწმებლად"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ანაბეჭდით გადაფურცვლა"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი ტელეფონის უკანა ნაწილზე მდებარეობს."</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c6f8796..4969f94 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Планшетті тексеру үшін түртіңіз"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Құрылғыны тексеру үшін түртіңіз"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін экранды түртіңіз."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Үрейлендіргіш дабыл түймесі"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> басқарады"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Қуат түймесін 5 рет жылдам басу арқылы төтенше жағдай әрекеттерін іске қосыңыз."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Хабарландыру дыбысы"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Әрекеттерді бастар алдындағы хабарландыру"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Төтенше жағдай дабылы"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> басқарады"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Қуат түймесін 5 рет жылдам басу арқылы төтенше жағдай әрекеттерін іске қосыңыз."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Ескерту дыбысы"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Әрекеттерді бастар алдындағы хабарландыру"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Хабарландыруларды көру үшін саусақ ізін пайдалану"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Саусақ ізі сканері"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Хабарландыруларды көру үшін телефонның артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 57da4d0..b9c9794 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1734,15 +1734,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ការស្កេនប៊្លូធូស"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបីជា​ប៊្លូធូសបិទ​ក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"សេវាកម្មទីតាំង​សម្រាប់​ការងារ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ការរកមើលល្វែងម៉ោង​របស់ទីតាំង"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ការរកមើលល្វែងម៉ោង​របស់ទីតាំង"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"អនុញ្ញាតឱ្យប្រើ​ទីតាំងរបស់ឧបករណ៍ ដើម្បីរកមើល​ល្វែងម៉ោងបច្ចុប្បន្ន។ ការកំណត់ទីតាំង​ផ្សេងទៀតដូចជា ការស្កេន Wi‑Fi ជាដើម​អាចប៉ះពាល់ដល់​ភាពត្រឹមត្រូវនៃការរកមើល​ល្វែងម៉ោង។"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"អនុញ្ញាតឱ្យប្រើ​ទីតាំងរបស់ឧបករណ៍ ដើម្បីចាប់ដឹងពី​ល្វែងម៉ោងបច្ចុប្បន្ន។ ការកំណត់ទីតាំង​ផ្សេងទៀតដូចជា ការស្កេន Wi‑Fi ជាដើម​អាចប៉ះពាល់ដល់​ភាពត្រឹមត្រូវនៃការចាប់ដឹងពី​ល្វែងម៉ោង។"</string>
     <string name="location_time_zone_detection_on" msgid="5514817179120761597">"បើក"</string>
     <string name="location_time_zone_detection_off" msgid="192427076195667079">"បិទ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ការរកមើល​ល្វែងម៉ោង​ដោយស្វ័យប្រវត្តិ​ត្រូវបាន​បិទ"</string>
-    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ការរកមើលល្វែងម៉ោង​របស់ទីតាំងត្រូវបានបិទ"</string>
-    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ការរកមើល​ល្វែងម៉ោងរបស់ទីតាំង​មិនអាចប្រើបានទេ"</string>
-    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ការផ្លាស់ប្ដូរ​ការរកមើលល្វែងម៉ោង​របស់ទីតាំងមិនត្រូវបាន​អនុញ្ញាតទេ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ការចាប់ដឹងពី​ល្វែងម៉ោង​ដោយស្វ័យប្រវត្តិ​ត្រូវបាន​បិទ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំងត្រូវបានបិទ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ការចាប់ដឹងពី​ល្វែងម៉ោងរបស់ទីតាំង​មិនអាចប្រើបានទេ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ការផ្លាស់ប្ដូរ​ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំងមិនត្រូវបាន​អនុញ្ញាតទេ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"វ៉ាយហ្វាយ &amp; ទីតាំង​បណ្ដាញ​ចល័ត"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ទីតាំង​បាន​កំណត់​ដោយ​វ៉ាយហ្វាយ"</string>
@@ -2449,7 +2449,7 @@
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"បើក​​កម្មវិធី​គ្រប់គ្រង​ថ្ម"</string>
     <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"បើក​កម្មវិធី​សន្សំ​ថ្ម​"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"អាចនឹងឆាប់​អស់​ថ្ម​​ជាងធម្មតា"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"កម្មវិធីសន្សំថ្មបានបើក"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"មុខងារ​សន្សំ​ថ្មបានបើក"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"មុខងារ​មួយចំនួន​អាច​ត្រូវ​បានដាក់កំហិត"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"ទូរសព្ទ​ត្រូវបានប្រើ​ប្រាស់ច្រើន​ជាង​ធម្មតា"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ថេប្លេត​ត្រូវបានប្រើប្រាស់ច្រើន​ជាង​ធម្មតា"</string>
@@ -2487,8 +2487,8 @@
     <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"កម្មវិធី​នេះ​​​នឹងអាចប្រើថ្ម​នៅ​ផ្ទៃ​ខាង​ក្រោយបាន។ ថ្ម​របស់អ្នក​អាចនឹង​​ឆាប់អស់​ជាង​ការរំពឹងទុក។"</string>
     <string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"លុប"</string>
     <string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"បោះបង់"</string>
-    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ទូរសព្ទ​របស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​កម្មវិធី​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
-    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ថេប្លេតរបស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​កម្មវិធី​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
+    <string name="battery_tip_dialog_summary_message" product="default" msgid="6097167058237891756">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ទូរសព្ទ​របស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​មុខងារ​សន្សំ​ថ្មបាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
+    <string name="battery_tip_dialog_summary_message" product="tablet" msgid="573297655597451123">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ថេប្លេតរបស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើកមុខងារ​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
     <string name="battery_tip_dialog_summary_message" product="device" msgid="8222461068860745749">"កម្មវិធី​របស់អ្នក​កំពុង​​ប្រើប្រាស់​​​ថ្ម​ក្នុងកម្រិត​ធម្មតា។ ប្រសិនបើ​កម្មវិធី​ប្រើថ្ម​ច្រើន​ខ្លាំងពេក ឧបករណ៍​របស់អ្នក​នឹងណែនាំ​សកម្មភាព​ផ្សេងៗ​ដែលអ្នក​អាចអនុវត្ត​បាន។\n\nអ្នក​អាច​បើក​កម្មវិធី​សន្សំ​ថ្ម​បាន​ជានិច្ច ប្រសិន​បើ​​ថ្ម​របស់អ្នក​នៅសល់តិច។"</string>
     <string name="smart_battery_manager_title" msgid="3677620516657920364">"កម្មវិធី​គ្រប់គ្រង​ថ្ម"</string>
     <string name="smart_battery_title" msgid="9095903608520254254">"គ្រប់គ្រង​កម្មវិធី​ដោយ​ស្វ័យប្រវត្តិ"</string>
@@ -2631,7 +2631,7 @@
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"បើក"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"ប្រើ​កម្មវិធីសន្សំថ្ម"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"ប្រើ​មុខងារ​សន្សំ​ថ្ម"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"កុំ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"នៅពេលដែលថ្មសល់ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -3312,8 +3312,8 @@
     <string name="keywords_touch_vibration" msgid="1125291201902251273">"ការប៉ះ ញ័រ អេក្រង់ ​កម្រិតរំញោច"</string>
     <string name="keywords_ring_vibration" msgid="1736301626537417541">"ការប៉ះ ការញ័រ ទូរសព្ទ ការហៅទូរសព្ទ រំញោច សំឡេងរោទ៍"</string>
     <string name="keywords_notification_vibration" msgid="9162262178415439951">"ការប៉ះ ការញ័រ រំញោច"</string>
-    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"កម្មវិធី​សន្សំ​ថ្ម ស្អិត នៅតែកើតឡើងដដែល កម្មវិធី​សន្សំថាមពល ថ្ម"</string>
-    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ទម្លាប់ កាលវិភាគ កម្មវិធីសន្សំថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
+    <string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"មុខងារ​សន្សំ​ថ្ម ស្អិត នៅតែកើតឡើងដដែល កម្មវិធីសន្សំថាមពល ថ្ម"</string>
+    <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ទម្លាប់ កាលវិភាគ មុខងារ​សន្សំ​ថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ការហៅទូរសព្ទ​កម្រិតខ្ពស់, ការហៅទូរសព្ទតាមរយៈប្រព័ន្ធ 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"បញ្ចូលភាសា បញ្ចូលភាសាមួយ"</string>
     <string name="keywords_font_size" msgid="336803136451166298">"ទំហំ​អក្សរ"</string>
@@ -3577,7 +3577,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>
@@ -4229,7 +4229,7 @@
     <string name="condition_zen_title" msgid="7674761111934567490">"មុខងារ​កុំ​រំខាន​បាន​បើក"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"បានបិទ​សំឡេង​ទូរសព្ទ"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"រួមជាមួយ​ការលើកលែង"</string>
-    <string name="condition_battery_title" msgid="6395113995454385248">"កម្មវិធីសន្សំថ្មបានបើក"</string>
+    <string name="condition_battery_title" msgid="6395113995454385248">"មុខងារ​សន្សំ​ថ្មបានបើក"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"បានរឹតបន្តឹង​មុខងារ"</string>
     <string name="condition_cellular_title" msgid="155474690792125747">"ទិន្នន័យ​ទូរសព្ទចល័តបានបិទ"</string>
     <string name="condition_cellular_summary" msgid="1678098728303268851">"អាចប្រើ​អ៊ីនធឺណិតតាមរយៈ Wi‑Fi តែប៉ុណ្ណោះ"</string>
@@ -4407,7 +4407,7 @@
     <string name="demo_mode" msgid="6566167465451386728">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</string>
     <string name="dark_ui_mode" msgid="898146394425795281">"រចនាប័ទ្ម​ងងឹត"</string>
     <string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="3936676430482852520">"បើក / បានបិទ​ជា​បណ្តោះអាសន្ន ដោយសារ​កម្មវិធីសន្សំថ្ម"</string>
-    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"បានបើក​ជា​បណ្តោះអាសន្ន ដោយសារ​កម្មវិធីសន្សំថ្ម"</string>
+    <string name="dark_ui_mode_disabled_summary_dark_theme_off" msgid="4154227921313505702">"បានបើក​ជា​បណ្តោះអាសន្ន ដោយសារ​មុខងារ​សន្សំ​ថ្ម"</string>
     <string name="dark_ui_settings_dark_summary" msgid="1214821092462388494">"កម្មវិធី​ដែលអាចប្រើបាន​ក៏នឹងប្ដូរទៅ​​រចនាប័ទ្ម​ងងឹតផងដែរ"</string>
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"យល់ហើយ"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"សាកល្បង​រចនាប័ទ្មងងឹត"</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ចុចដើម្បី​ពិនិត្យមើលថេប្លេត"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ចុចដើម្បី​ពិនិត្យមើល​ឧបករណ៍"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ដើម្បី​ពិនិត្យមើល​ម៉ោង ការជូន​ដំណឹង និងព័ត៌មាន​ផ្សេងទៀត សូម​ចុចអេក្រង់​របស់អ្នក។"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ប៊ូតុង​បំភ័យ"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"គ្រប់គ្រងដោយ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ចាប់ផ្ដើម​សកម្មភាព​ហៅទូរសព្ទទៅ​សេវាសង្គ្រោះបន្ទាន់ ដោយចុច​ប៊ូតុងថាមពលឱ្យរហ័ស 5 ដង។"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"សំឡេងព្រមាន"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ការជូនដំណឹង មុនពេល​ចាប់ផ្ដើមសកម្មភាព"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ការហៅទៅ​លេខសង្គ្រោះបន្ទាន់"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"គ្រប់គ្រងដោយ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ចាប់ផ្ដើម​សកម្មភាព​ហៅទូរសព្ទទៅ​សេវាសង្គ្រោះបន្ទាន់ ដោយចុច​ប៊ូតុងថាមពលឱ្យរហ័ស 5 ដង។"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"សំឡេងព្រមាន"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"ជូនដំណឹង មុនពេល​ចាប់ផ្ដើមសកម្មភាព"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"អូសលើ​ឧបករណ៍ចាប់ស្នាមម្រាមដៃ​សម្រាប់​ការជូនដំណឹង"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"អូសស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយទូរសព្ទរបស់អ្នក។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 0f88b17..505e070 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2510,10 +2510,8 @@
       <item quantity="other">%1$d ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಮೀಟರ್ ಓದುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಮೀಟರ್ ಓದುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಲು"</annotation>" ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
@@ -4128,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶವನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳುವುದೇ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ಈ ಅಪ್ಲಿಕೇಶನ್ ರಚಿಸಿರುವಂತಹ ಎಲ್ಲ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಬೇಡಿ"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಿ"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"ನಿಮ್ಮ ಬ್ಯಾಟರಿಯನ್ನು ತ್ವರಿತವಾಗಿ ಬರಿದಾಗಿಸಬಹುದು. ಹಿನ್ನೆಲೆ ಬ್ಯಾಟರಿ ಬಳಸದಂತೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಇನ್ನು ಮುಂದೆ ನಿರ್ಬಂಧಿಸಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಗೆ ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳನ್ನು ಕಡೆಗಣಿಸಲು <xliff:g id="APP">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
@@ -4500,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ಪ್ಯಾನಿಕ್ ಬಟನ್"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ಪವರ್ ಬಟನ್ ಅನ್ನು ತ್ವರಿತವಾಗಿ 5 ಬಾರಿ ಒತ್ತುವ ಮೂಲಕ ತುರ್ತು SOS ಆ್ಯಕ್ಷನ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ಎಚ್ಚರಿಕೆಯ ಶಬ್ದ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ಆ್ಯಕ್ಷನ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ಎಚ್ಚರಿಕೆ ನೀಡಿ"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಹಿಂಭಾಗದಲ್ಲಿನ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 55eea94..8801819 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"탭하여 태블릿 확인"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"탭하여 기기 확인"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"시간, 알림, 기타 정보를 확인하려면 화면을 탭하세요."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"긴급 버튼"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"관리: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"전원 버튼을 빠르게 5회 누르면 긴급 SOS 기능이 실행됩니다."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"알림 사운드"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"긴급 SOS 기능 실행 전에 알립니다."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"응급 SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"관리자: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"전원 버튼을 빠르게 5회 누르면 긴급 SOS 기능이 실행됩니다."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"경고음"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"긴급 SOS 기능 실행 전에 알립니다."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"지문을 스와이프하여 알림 보기"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"지문 스와이프"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"알림을 확인하려면 휴대전화 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index ada2371..3e56dcd 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Планшетти текшерүү үчүн, басып коюу"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Түзмөктү текшерүү үчүн, басып коюу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн, экранды таптап коюңуз."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Сирена баскычы"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> башкарат"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Күйгүзүү/өчүрүү баскычын 5 жолу катары менен басып, SOS аракеттерин иштетиңиз."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Эскертүү добушу"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Аракеттерди аткарып баштоодон мурда эскертүү"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Шашылыш SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> башкарат"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Күйгүзүү/өчүрүү баскычын 5 жолу катары менен басып, SOS аракеттерин иштетиңиз."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Эскертүү добушу"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Аракеттерди аткарып баштоодон мурда эскертүү"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Билдирмелерди манжа изинин сенсору менен көрүү"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Манжа изинин сканери"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Билдирмелериңизди текшерүү үчүн, телефондун аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 17c60c7..812e020 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ແຕະເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ແຕະເພື່ອກວດສອບອຸປະກອນ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະໃສ່ໜ້າຈໍຂອງທ່ານ."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ປຸ່ມສັນຍານເຕືອນໄພ"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"ຈັດການໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ເລີ່ມຄຳສັ່ງ SOS ສຸກເສີນໂດຍການກົດປຸ່ມເປີດປິດໄວໆ 5 ເທື່ອ."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ສຽງຄຳເຕືອນ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ແຈ້ງເຕືອນກ່ອນເລີ່ມຄຳສັ່ງ"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS ສຸກເສີນ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"ຈັດການໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ເລີ່ມຄຳສັ່ງ SOS ສຸກເສີນໂດຍການກົດປຸ່ມເປີດປິດໄວໆ 5 ເທື່ອ."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"ສຽງຄຳເຕືອນ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"ແຈ້ງເຕືອນກ່ອນເລີ່ມຄຳສັ່ງ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ປັດລາຍນິ້ວມືສຳລັບການແຈ້ງເຕືອນ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ປັດລາຍນິ້ວມື"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2fb5f1d..8ca5dc6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Palieskite, kad patikrintumėte planšetinį kompiuterį"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Palieskite, kad patikrintumėte įrenginį"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, palieskite ekraną."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Pavojaus signalo mygtukas"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Tvarko „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pradėkite pagalbos iškvietimo kritiniu atveju veiksmus penkis kartus greitai paspausdami maitinimo mygtuką."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Įspėjamasis garsas"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Įspėti prieš pradedant veiksmus"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Pagalbos iškvietimas kritiniu atveju"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Tvarko „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Pradėkite pagalbos iškvietimo kritiniu atveju veiksmus penkis kartus greitai paspausdami maitinimo mygtuką."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Įspėjamasis garsas"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Įspėti prieš pradedant veiksmus"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Perbraukimas piršto antspaudo jutikliu norint peržiūrėti pranešimus"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Perbr. kontr. k. jutikliu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu telefono užpakalinėje dalyje."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 23fa234..d210701 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -4571,11 +4571,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planšetdatora paziņojumu pārbaude pieskaroties"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ierīces paziņojumu pārbaude pieskaroties"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Lai skatītu laiku, paziņojumus un citu informāciju, pieskarieties ekrānam."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Trauksmes poga"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Pārvalda <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Sākt ārkārtas palīdzības darbības, ja piecreiz strauji nospiežat barošanas pogu."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Brīdinājuma signāls"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Brīdināt pirms darbību sākšanas."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Ārkārtas palīdzība"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Pārvalda <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Sākt ārkārtas palīdzības darbības, ja piecreiz strauji nospiežat barošanas pogu."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Brīdinājuma signāls"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Brīdināt pirms darbību sākšanas."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Ziņu skatīšana ar pirksta nospiedumu"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Nospiedumu skeneris"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 10aad43..6e392db 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1952,7 +1952,7 @@
     <string name="internal_storage" msgid="999496851424448809">"Внатрешен капацитет"</string>
     <string name="recompute_size" msgid="1098091228370999128">"Повторно пресметување големина..."</string>
     <string name="clear_data_dlg_title" msgid="180446967743732410">"Да се избришат податоците на апликацијата?"</string>
-    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци, итн."</string>
+    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци итн."</string>
     <string name="dlg_ok" msgid="1421350367857960997">"Во ред"</string>
     <string name="dlg_cancel" msgid="5164705061530774899">"Откажи"</string>
     <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Допрете за да го проверите таблетот"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Допрете за да го проверите уредот"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"За да ги проверите времето, известувањата и другите информации, допрете го екранот."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Копче за паника"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Управувано од <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Започнете ги SOS-дејствата за итни случаи со брзо притискање на копчето за вклучување 5 пати."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Предупредувачки звук"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Предупреди пред да ги започнеш дејствата"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS за итни случаи"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Управувано од <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Започнете ги SOS-дејствата за итни случаи со брзо притискање на копчето за вклучување 5 пати."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Предупредувачки звук"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Предупреди пред да ги започнеш дејствата"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Повлечете отпечаток за известувања"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Повлечете отпечаток"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на телефонот."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b253eee..2f34635 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -4126,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് <xliff:g id="APP">%1$s</xliff:g> ആപ്പിനുള്ള ആക്സസ് പിൻവലിക്കണോ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ഈ ആപ്പ് സൃഷ്ടിച്ചിട്ടുള്ള എല്ലാ \'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങളും നീക്കംചെയ്യപ്പെടും."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ഓപ്റ്റിമൈസ് ചെയ്യരുത്"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ഓപ്‌റ്റിമൈസ് ചെയ്യുക"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"നിങ്ങളുടെ ബാറ്ററി ചാർജ് കൂടുതൽ വേഗത്തിൽ തീർന്നേക്കാം. പശ്ചാത്തലത്തിൽ ബാറ്ററി ഉപയോഗിക്കുന്നതിൽ നിന്ന് ആപ്പ് ഇനി നിയന്ത്രിക്കപ്പെടില്ല."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ബാറ്ററിക്ക് കൂടുതൽ ഈടുകിട്ടുന്നതിന് ശുപാർശ ചെയ്യുന്നു"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"ബാറ്ററി ഒപ്റ്റിമൈസേഷനുകൾ അവഗണിക്കാൻ <xliff:g id="APP">%s</xliff:g> എന്നതിനെ അനുവദിക്കണോ?"</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ടാബ്‌ലെറ്റ് പരിശോധിക്കാൻ, ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ഉപകരണം പരിശോധിക്കാൻ, ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കാൻ, നിങ്ങളുടെ സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"പാനിക് ബട്ടൺ"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യുന്നത്"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"പവർ ബട്ടൺ വേഗത്തിൽ 5 പ്രാവശ്യം അമർത്തുന്നതിലൂടെ അടിയന്തര SOS പ്രവർത്തനങ്ങൾ ആരംഭിക്കുക."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"മുന്നറിയിപ്പ് ശബ്‌ദം"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"പ്രവർത്തനങ്ങൾ ആരംഭിക്കുന്നതിന് മുമ്പ് അറിയിക്കുക"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"അടിയന്തര SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യുന്നത്"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"പവർ ബട്ടൺ 5 തവണ വേഗത്തിൽ അമർത്തി അടിയന്തര SOS പ്രവർത്തനങ്ങൾ ആരംഭിക്കുക."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"മുന്നറിയിപ്പ് ശബ്‌ദം"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"പ്രവർത്തനങ്ങൾ ആരംഭിക്കുന്നതിന് മുമ്പ് അറിയിക്കുക"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"അറിയിപ്പുകൾക്ക് ഫിംഗർപ്രിന്റ് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ഫിംഗർപ്രിന്റ് സ്വൈപ്പ്"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്‍റെ പിൻവശത്തുള്ള ഫിംഗർപ്രിന്റ് സെൻസറിൽ താഴേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 56574c7..c585f8d 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -222,7 +222,7 @@
   <string-array name="app_ops_categories">
     <item msgid="528483497841471005">"Байршил"</item>
     <item msgid="7786376598377098070">"Хувийн"</item>
-    <item msgid="7707692387382449990">"Зурвас"</item>
+    <item msgid="7707692387382449990">"Мессеж"</item>
     <item msgid="2235402926760712958">"Медиа"</item>
     <item msgid="1822578131647724167">"Төхөөрөмж"</item>
   </string-array>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 761bd3d..78c23fe 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -129,8 +129,8 @@
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="7153531868579789993">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> таны харилцагчид болон дуудлагын түүхэнд хандах хүсэлтэй байна. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>-д хандах зөвшөөрөл олгох уу?"</string>
     <string name="bluetooth_remember_choice" msgid="173821849670438110">"Дахиж үл асуух"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2080511174185036562">"Дахиж үл асуух"</string>
-    <string name="bluetooth_map_request" msgid="8664081227240707479">"Зурваст хандах хүсэлт"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s таны зурвасуудад хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
+    <string name="bluetooth_map_request" msgid="8664081227240707479">"Мессежинд хандах хүсэлт"</string>
+    <string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s таны мессежүүдэд хандалт хийх хүсэлтэй байна. %2$s-д хандалт хийхийг зөвшөөрөх үү?"</string>
     <string name="bluetooth_sap_request" msgid="473439406287008397">"СИМ хандалтын хүсэлт"</string>
     <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> нь таны СИМ картанд хандах хүсэлтэй байна. СИМ картанд хандалтыг нээж өгснөөр холболтын хугацааны туршид төхөөрөмжийн дата холболтыг идэвхгүй болгоно. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>-д хандалтыг нээх"</string>
     <string name="bluetooth_device_name_summary" msgid="8678342689845439583">"Бусад төхөөрөмжид “<xliff:g id="DEVICE_NAME">^1</xliff:g>”-р харагдана"</string>
@@ -904,12 +904,12 @@
     <string name="wifi_show_password" msgid="6865993988238157923">"Нууц үгийг харуулах"</string>
     <string name="wifi_ap_band_config" msgid="1589020070150933055">"AP Band сонгох"</string>
     <string name="wifi_ap_choose_auto" msgid="8944442003151215691">"Автомат"</string>
-    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 ГГц зурвас"</string>
-    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 Гц зурвас"</string>
-    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 Гц Зурвасыг тохиромжтой гэж үздэг"</string>
+    <string name="wifi_ap_choose_2G" msgid="1436802195991542016">"2.4 ГГц мессеж"</string>
+    <string name="wifi_ap_choose_5G" msgid="8413248472288180075">"5.0 Гц мессеж"</string>
+    <string name="wifi_ap_prefer_5G" msgid="2520628479818369902">"5.0 Гц Мессежийг тохиромжтой гэж үздэг"</string>
     <string name="wifi_ap_2G" msgid="4099628221864343015">"2.4 Гц"</string>
     <string name="wifi_ap_5G" msgid="3493942667238551207">"5.0 Гц"</string>
-    <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг зурвасыг сонгоно уу:"</string>
+    <string name="wifi_ap_band_select_one" msgid="5221193733812493435">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг мессежийг сонгоно уу:"</string>
     <string name="wifi_ip_settings" msgid="6420498748726599133">"IP тохиргоо"</string>
     <string name="wifi_privacy_settings" msgid="3283946009000725698">"Нууцлал"</string>
     <string name="wifi_subscription" msgid="4432423938285430113">"Захиалга"</string>
@@ -1061,7 +1061,7 @@
     <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Сүлжээний цэгийн нууц үг"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Зурвас"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Мессеж"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Бусад төхөөрөмждөө Wi‑Fi холболт үүсгэхийн тулд сүлжээний цэгийг ашиглана уу. Сүлжээний цэг нь таны мобайл датаны холболтоор интернетэд холбогдоно. Мобайл датаны нэмэлт төлбөр гарна."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Апп ойролцоох төхөөрөмжтэй агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Сүлжээний цэгийг автоматаар унтраана"</string>
@@ -1335,7 +1335,7 @@
     <string name="sim_change_data_message" msgid="3046178883369645132">"Та <xliff:g id="CARRIER2_0">%2$s</xliff:g>-г мобайл датад ашиглаж байна. Хэрэв та <xliff:g id="CARRIER1">%1$s</xliff:g> руу сэлгэвэл <xliff:g id="CARRIER2_1">%2$s</xliff:g>-г мобайл датад ашиглах боломжгүй."</string>
     <string name="sim_change_data_ok" msgid="4922114750417276560">"<xliff:g id="CARRIER">%1$s</xliff:g>-г ашиглах"</string>
     <string name="sim_preferred_title" msgid="7182406911552216373">"Өөрийн сонгосон SIM картаа шинэчлэх үү?"</string>
-    <string name="sim_preferred_message" msgid="6004009449266648351">"Таны төхөөрөмжид зөвхөн <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM байна. Та мобайл дата ашиглах, дуудлага хийх, SMS зурвасын үйлчилгээ авахын тулд энэ SIM-г ашиглах уу?"</string>
+    <string name="sim_preferred_message" msgid="6004009449266648351">"Таны төхөөрөмжид зөвхөн <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM байна. Та мобайл дата ашиглах, дуудлага хийх, SMS мессежийн үйлчилгээ авахын тулд энэ SIM-г ашиглах уу?"</string>
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"СИМ ПИН код буруу, та төхөөрөмжийн түгжээх тайлахын тулд өөрийн оператор компанитай холбоо барина уу."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="other">СИМ-ны ПИН код буруу байна. Та <xliff:g id="NUMBER_1">%d</xliff:g> удаа оролдлого хийх боломжтой байна.</item>
@@ -2220,7 +2220,7 @@
     <string name="accessibility_timeout_2mins" msgid="7901692984522708679">"2 минут"</string>
     <string name="accessibility_setting_item_control_timeout_title" msgid="1600516937989217899">"Үйлдэл хийх хугацаа (Хандалтын хугацаа)"</string>
     <string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Үйлдэл хийх хугацаа"</string>
-    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг зурвасыг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
+    <string name="accessibility_control_timeout_preference_summary" msgid="5283566580551714506">"Танаас үйлдэл хийхийг шаарддаг хэдий ч зөвхөн түр хугацаанд харагддаг мессежийг хэр удаан хугацаагаар харуулахыг сонгоно уу.\n\nЗарим апп энэ тохиргоог дэмждэггүй."</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Хүрээд &amp; барьж хүлээх"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Өнгө хувиргалт"</string>
     <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Өнгө хувиргалтыг ашиглах"</string>
@@ -2739,7 +2739,7 @@
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
     <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Өөрийн Wi‑Fi нууц үгс, тэмдэглэгээ, бусад тохиргоонууд болон апп өгөгдлийг Google серверт нөөцлөхийг зогсоож бүх хуулбарыг нь устгах уу?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Төхөөрөмжийн өгөгдөл (Wi-Fi-ийн нууц үг, дуудлагын түүх гэх мэт) болон апп-ийн өгөгдлийг (тохиргоо болон апп-ийн хадгалсан файл гэх мэт) нөөцлөхөө зогсоож, алсын сервер дэх хуулбарыг устгах уу?"</string>
-    <string name="fullbackup_data_summary" msgid="971587401251601473">"Алсаас автоматаар төхөөрөмжийн өгөгдөл (Wi-Fi нууц үг, дуудлагын түүх гэх мэт) ба апп-ын өгөгдөл (апп-ын тохиргоо, хадгалсан файл гэх мэт)-ийг нөөцлөх.\n\nАвтомат нөөцлөлт нээсэн тохиолдолд төхөөрөмж, апп-ын өгөгдлийг тогтмол хугацаанд алсаас хадгална. Тус өгөгдөлд апп-ын хадгалсан бүх өгөгдөл орно (хөгжүүлэгчийн тохиргоонд үндэслэн). Үүнд: харилцагчийн хаяг, зурвас, зураг гэх мэт хувийн мэдээлэл."</string>
+    <string name="fullbackup_data_summary" msgid="971587401251601473">"Алсаас автоматаар төхөөрөмжийн өгөгдөл (Wi-Fi нууц үг, дуудлагын түүх гэх мэт) ба апп-ын өгөгдөл (апп-ын тохиргоо, хадгалсан файл гэх мэт)-ийг нөөцлөх.\n\nАвтомат нөөцлөлт нээсэн тохиолдолд төхөөрөмж, апп-ын өгөгдлийг тогтмол хугацаанд алсаас хадгална. Тус өгөгдөлд апп-ын хадгалсан бүх өгөгдөл орно (хөгжүүлэгчийн тохиргоонд үндэслэн). Үүнд: харилцагчийн хаяг, мессеж, зураг гэх мэт хувийн мэдээлэл."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Төхөөрөмжийн админы тохиргоо"</string>
     <string name="active_device_admin_msg" msgid="7744106305636543184">"Төхөөрөмжийн админы апп"</string>
     <string name="remove_device_admin" msgid="3143059558744287259">"Энэ төхөөрөмжийн админ аппыг идэвхгүй болгох"</string>
@@ -2811,9 +2811,9 @@
     <string name="remove_account_label" msgid="4169490568375358010">"Бүртгэлийг хасах"</string>
     <string name="header_add_an_account" msgid="3919151542338822661">"Бүртгэл нэмэх"</string>
     <string name="really_remove_account_title" msgid="253097435885652310">"Бүртгэлийг арилгах уу?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Энэ акаунтыг арилгаснаас үүний бүх зурвас, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
-    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Энэ бүртгэлийг хассанаар үүний бүх зурвас, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
-    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Энэ бүртгэлийг устгаснаар үүний бүх зурвас, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="8893801622174947887">"Энэ акаунтыг арилгаснаас үүний бүх мессеж, харилцагчид болон бусад өгөгдлүүдийг таблетаас устгах болно!"</string>
+    <string name="really_remove_account_message" product="default" msgid="1217810840427479274">"Энэ бүртгэлийг хассанаар үүний бүх мессеж, харилцагчид, бусад өгөгдлийг утаснаас устгах болно!"</string>
+    <string name="really_remove_account_message" product="device" msgid="5241756807386611084">"Энэ бүртгэлийг устгаснаар үүний бүх мессеж, харилцагч болон бусад өгөгдлийг төхөөрөмжөөс устгана!"</string>
     <string name="remove_account_failed" msgid="3709502163548900644">"Энэ өөрчлөлтийг таны админ зөвшөөрөөгүй байна"</string>
     <string name="cant_sync_dialog_title" msgid="2613000568881139517">"Гараар синк хийх боломжгүй"</string>
     <string name="cant_sync_dialog_message" msgid="7612557105054568581">"Энэ зүйлийн синкийг одоогоор идэвхгүйжүүлсэн байна. Тохиргоог өөрчлөхийн тулд далд дата болон автомат синкийг түр идэвхжүүлнэ үү."</string>
@@ -3442,8 +3442,8 @@
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Ойлголоо"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Мэдэгдэл"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Үргэлжлэх хугацаа"</string>
-    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Зурвас, арга хэмжээ &amp; сануулагч"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой."</string>
+    <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Мессеж, арга хэмжээ &amp; сануулагч"</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Бүү саад бол горим асаалттай үед мессеж, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд мессежын тохиргоог өөрчлөх боломжтой."</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"Дууссан"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Тохиргоо"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй"</string>
@@ -3629,9 +3629,9 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"Суулгасан апп-аас мэдэгдлийн хандалт хүссэн апп байхгүй байна."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Мэдэгдэлд хандахыг зөвшөөрөх"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g>-н мэдэгдлийн хандалтыг зөвшөөрөх үү?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах зурвасын текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах мессежийн текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g>-д мэдэгдлийн хандалтыг зөвшөөрөх үү?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах зурвасын текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь харилцагчийн нэр, таны хүлээн авах мессежийн текст зэрэг таны хувийн мэдээллийг агуулах бүх мэдэгдлийг унших боломжтой болно. Мөн түүнчлэн, энэ апп нь мэдэгдлүүдийг хаах эсвэл утасны дуудлагад хариулах зэргээр мэдэгдэл доторх товчлууруудын үйлдлийг хийх боломжтой болно. \n\nЭнэ нь аппад Бүү саад бол горимыг асаах эсвэл унтраах, түүнтэй холбоотой тохиргоог өөрчлөхийг мөн зөвшөөрнө."</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Хэрэв та <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-н мэдэгдлийн хандалтыг унтраавал Бүү саад бол хандалт мөн адил унтрах болно."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Унтраах"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Цуцлах"</string>
@@ -3778,13 +3778,13 @@
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-д ирэх дуудлагыг хориглосон. Та найзууд, гэр бүлийнхэн болон бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Одоор тэмдэглэсэн харилцагчид"</string>
     <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Байхгүй}=1{{contact_1}}=2{{contact_1} болон {contact_2}}=3{{contact_1}, {contact_2} болон {contact_3}}other{{contact_1}, {contact_2} болон бусад #}}"</string>
-    <string name="zen_mode_messages" msgid="7315084748885170585">"Зурвасууд"</string>
-    <string name="zen_mode_messages_list" msgid="5431014101342361882">"зурвас"</string>
-    <string name="zen_mode_messages_title" msgid="1777598523485334405">"Зурвас"</string>
-    <string name="zen_mode_messages_header" msgid="253721635061451577">"Тасалдуулах боломжтой зурвас"</string>
-    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"Зөвшөөрөгдсөн зурвасууд дуугарч байгааг шалгахын тулд уг төхөөрөмжийг дуугаргах дээр нь тохируулсан эсэхийг шалгана уу"</string>
-    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх зурвасыг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
-    <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Бүх зурвас танд хүрэх боломжтой"</string>
+    <string name="zen_mode_messages" msgid="7315084748885170585">"Мессежүүд"</string>
+    <string name="zen_mode_messages_list" msgid="5431014101342361882">"мессеж"</string>
+    <string name="zen_mode_messages_title" msgid="1777598523485334405">"Мессеж"</string>
+    <string name="zen_mode_messages_header" msgid="253721635061451577">"Тасалдуулах боломжтой мессеж"</string>
+    <string name="zen_mode_messages_footer" msgid="6002468050854126331">"Зөвшөөрөгдсөн мессежүүд дуугарч байгааг шалгахын тулд уг төхөөрөмжийг дуугаргах дээр нь тохируулсан эсэхийг шалгана уу"</string>
+    <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх мессежийг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
+    <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Бүх мессеж танд хүрэх боломжтой"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Бүх дуудлага танд хүрэх боломжтой"</string>
     <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Байхгүй}=1{1 харилцагч}other{# харилцагч}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Дурын хүн"</string>
@@ -3891,18 +3891,18 @@
     <string name="experimental_preference" msgid="869354050717870055">"(Туршилтын)"</string>
     <string name="encryption_interstitial_header" msgid="4418014339568737685">"Аюулгүй эхлэл"</string>
     <string name="encryption_continue_button" msgid="3591796237625134622">"Үргэлжлүүлэх"</string>
-    <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө зурган түгжээ шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө нууц үг шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө зурган түгжээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө хээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө ПИН-ээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
-    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө хээгээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
-    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө нууц үгээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө зурган түгжээ шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө нууц үг шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө зурган түгжээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө хээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө ПИН-ээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө хээгээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө нууц үгээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Тийм"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Үгүй"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Хязгаарласан"</string>
@@ -4334,9 +4334,9 @@
     <string name="home_app" msgid="6056850504746902747">"Үндсэн апп"</string>
     <string name="no_default_home" msgid="3588073707316139318">"Үндсэн нүүр хуудас тохируулаагүй байна"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="4098653943835666086">"Аюулгүй эхлэл"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Төхөөрөмжөө асаахын тулд загвар оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, зурвас, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Төхөөрөмжөө асаахын тулд PIN оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, зурвас, мэдэгдэл хүлээн авах, эсвэл сэрүүлэг дуугарах боломжгүй."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Төхөөрөмжөө асаахын тулд нууц үг оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, зурвас, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Төхөөрөмжөө асаахын тулд загвар оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, мессеж, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Төхөөрөмжөө асаахын тулд PIN оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, мессеж, мэдэгдэл хүлээн авах, эсвэл сэрүүлэг дуугарах боломжгүй."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Төхөөрөмжөө асаахын тулд нууц үг оруулахаар тохируулаарай. Төхөөрөмж унтраалттай үед дуудлага, мессеж, мэдэгдэл хүлээн авах болон сэрүүлэг дуугарах боломжгүй."</string>
     <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Өөр хурууны хээ нэмэх"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Түгжээг өөр хуруугаар тайлах"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"Асаасан"</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Таблетаа шалгахын тулд товшино уу"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Төхөөрөмжийг шалгахын тулд товшино уу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд дэлгэцээ товшино уу."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Түгшүүрийн товчлуур"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g>-р удирддаг"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Асаах товчыг 5 удаа хурдан дарж, яаралтай тусламжийн SOS үйлдлийг эхлүүлээрэй."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Сануулгын дуу"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Үйлдлийг эхлүүлэхийн өмнө сэрэмжлүүлнэ"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Яаралтай тусламжийн SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> удирддаг"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Асаах/унтраах товчийг 5 удаа хурдан дарж, яаралтай тусламжийн SOS үйлдлийг эхлүүлээрэй."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Сануулгын дуу"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Үйлдлийг эхлүүлэхийн өмнө сэрэмжлүүлнэ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Мэдэгдэл харах бол хурууны хээгээ шударна уу"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Хурууны хээгээр шудрах"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Мэдэгдлээ шалгахын тулд утасныхаа арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0616326..0f5db3c 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1735,24 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ऑफिससाठीच्या स्थान सेवा"</string>
-    <!-- no translation found for location_time_zone_detection_screen_title (8396625087466311625) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_title (1195178875042989835) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_description (1064716900984397624) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_on (5514817179120761597) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_off (192427076195667079) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_auto_is_off (8067073548483627695) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_applicable (6757964612836952714) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_supported (3251181656388306501) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_allowed (8264525161514617051) -->
-    <skip />
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानाचे टाइमझोन डिटेक्शन"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानाचे टाइमझोन डिटेक्शन"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"सध्याचा टाइमझोन डिटेक्ट करण्यासाठी डिव्हाइसचे स्थान वापरण्याची परवानगी द्या. वाय-फाय स्कॅनिंग सारखी इतर स्थान सेटिंग्ज टाइमझोन डिटेक्शनच्या अचूकतेवर परिणाम करू शकतात."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"सुरू करा"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"बंद करा"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ऑटोमॅटिक टाइमझोन डिटेक्शन बंद केले आहे"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"स्थानाचे टाइमझोन डिटेक्शन बंद केले आहे"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"स्थानाच्या टाइमझोन डिटेक्शनला सपोर्ट नाही"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"स्थानाच्या टाइमझोन डिटेक्शनमधील बदलांना अनुमती नाही"</string>
     <string name="location_network_based" msgid="5247042890080021887">"वाय-फाय आणि मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी ॲप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
@@ -2520,10 +2511,8 @@
       <item quantity="one">%1$d अ‍ॅप प्रतिबंधित केले</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"तुमचे बॅटरी मीटर वाचताना समस्या आली"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"तुमचे बॅटरी मीटर वाचताना समस्या आली. अधिक जाणून घेण्यासाठी "<annotation id="url">" वर टॅप करा"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"अ‍ॅप बंद करायचे का?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या फोनला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या टॅबलेटला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
@@ -3586,15 +3575,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"प्राधान्यावर असलेली संभाषणे"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"संभाषण विभागाच्या सर्वात वरती दाखवा आणि फ्लोटिंग बबल म्हणून दिसतील"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"संभाषण विभागाच्या सर्वात वरती दाखवा"</string>
-    <!-- no translation found for other_conversations (551178916855139870) -->
-    <skip />
+    <string name="other_conversations" msgid="551178916855139870">"प्राधान्य नसलेली संभाषणे"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"तुम्ही बदल केलेली संभाषणे"</string>
-    <!-- no translation found for recent_conversations (471678228756995274) -->
-    <skip />
-    <!-- no translation found for conversation_settings_clear_recents (7502738708058226585) -->
-    <skip />
-    <!-- no translation found for clear (5092178335409471100) -->
-    <skip />
+    <string name="recent_conversations" msgid="471678228756995274">"अलीकडील संभाषणे"</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>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"प्राधान्य असलेली आणि बदल केलेली संभाषणे येथे दिसतील"</string>
@@ -4142,7 +4127,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका मध्‍ये प्रवेश करणे रद्द करायचे?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"या ॲपने तयार केलेले सर्व व्यत्यय आणू नका नियम काढले जातील."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ऑप्टिमाइझ करू नका"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ऑप्टिमाइझ करा"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"तुमची बॅटरी खूप लवकर संपवू शकते. यापुढे अ‍ॅप बॅकग्राउंड बॅटरी वापरण्यापासून प्रतिबंधित नसेल."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"बॅटरी चांगली चालण्यासाठी शिफारस केलेले"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"बॅटरी ऑप्टिमायझेशनकडे दुर्लक्ष करण्यासाठी <xliff:g id="APP">%s</xliff:g> ला अनुमती द्यायची?"</string>
@@ -4514,11 +4499,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"टॅबलेट तपासण्यासाठी टॅप करा"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"डिव्हाइस तपासण्यासाठी टॅप करा"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी तुमच्या स्क्रीनवर टॅप करा."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"पॅनिक बटण"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केलेले"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"पॉवर बटण झटपट पाच वेळा दाबून आणीबाणी SOS क्रिया सुरू करा."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"चेतावणीचा आवाज"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"क्रिया सुरू करण्याआधी सूचित करा"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"आणीबाणी SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केलेले"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"पॉवर बटण पाच वेळा झटपट दाबून आणीबाणी SOS क्रिया सुरू करा."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"चेतावणीचा आवाज"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"कृती सुरू करण्याआधी सूचित करा"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनांसाठी फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"तुमच्या सूचना तपासण्यासाठी, तुमच्या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index a62a33d..7a17f687 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ketik untuk memeriksa tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ketik untuk memeriksa peranti"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Untuk menyemak masa, pemberitahuan dan maklumat lain, ketik skrin anda."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Butang panik"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Diurus oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Mulakan tindakan SOS kecemasan dengan menekan butang kuasa dengan cepat sebanyak 5 kali."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Bunyi amaran"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Beri amaran sebelum memulakan tindakan"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS Kecemasan"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Diurus oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Mulakan tindakan SOS kecemasan dengan menekan butang kuasa dengan cepat sebanyak 5 kali."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Bunyi amaran"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Berikan amaran sebelum memulakan tindakan"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Leret cap jari untuk pemberitahuan"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Leret cap jari"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang telefon anda."</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 03de67d..e0bf959 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"တက်ဘလက်ကို စစ်ဆေးရန် တို့ပါ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"စက်ပစ္စည်းကို စစ်ဆေးရန် တို့ပါ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်ဖန်သားပြင်ကို တို့ပါ။"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ကြောက်လန့်လျှင်နှိပ်ရန် ခလုတ်"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စီမံခန့်ခွဲသည်"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"\'ဖွင့်ပိတ်ခလုတ်\' ကို ၅ ကြိမ် အမြန်နှိပ်ခြင်းဖြင့် အရေးပေါ် SOS လုပ်ဆောင်ချက်များကို စတင်ပါ။"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"သတိပေးသံ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"လုပ်ဆောင်ချက်များ မစတင်မီ သတိပေးသည်"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"အရေးပေါ် SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စီမံခန့်ခွဲသည်"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ဖွင့်ပိတ်ခလုတ်ကို ၅ ကြိမ် အမြန်နှိပ်ခြင်းဖြင့် အရေးပေါ် SOS လုပ်ဆောင်ချက်များကို စတင်ပါ။"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"သတိပေးသံ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"လုပ်ဆောင်ချက်များ မစတင်မီ သတိပေးသည်"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"သတိပေးချက်အတွက် လက်ဗွေပွတ်ဆွဲပါ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"လက်ဗွေပွတ်ဆွဲခြင်း"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"အကြောင်းကြားချက်များကို ကြည့်ရန် ဖုန်း၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 115542e..790f7ff 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Trykk for å sjekke nettbrettet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Trykk for å sjekke enheten"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Trykk på skjermen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panikknapp"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Administreres av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start nødhandlingene ved å trykke raskt fem ganger på av/på-knappen."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Varsellyd"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Varsle før handlingene startes"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS for nødssituasjoner"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Administreres av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start nødhandlingene ved å trykke raskt fem ganger på av/på-knappen."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Varsellyd"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Varsle før handlingene startes"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sveip fingersensoren for varsler"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sveip på fingersensoren"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 39f4db8..1d6d9a9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1734,24 +1734,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लुटुथ स्क्यान हुँदै"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ निष्क्रिय भएको बेलामा पनि) वरपरका यन्त्रहरू स्क्यान गर्न अनुमति दिनुहोस्‌। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"कार्यस्थलका स्थानसम्बन्धी सेवाहरू"</string>
-    <!-- no translation found for location_time_zone_detection_screen_title (8396625087466311625) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_title (1195178875042989835) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_description (1064716900984397624) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_on (5514817179120761597) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_off (192427076195667079) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_auto_is_off (8067073548483627695) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_applicable (6757964612836952714) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_supported (3251181656388306501) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_allowed (8264525161514617051) -->
-    <skip />
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"हालको समय क्षेत्र पत्ता लगाउनका निम्ति यन्त्रको स्थानसम्बन्धी जानकारी प्रयोग गर्न दिन्छ। Wi-Fi स्क्यान गर्ने सुविधा जस्ता स्थानसम्बन्धी अन्य सेटिङका कारण सटीक समय क्षेत्र पत्ता लगाउन गाह्रो हुन सक्छ।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"अन छ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"अफ छ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"समय क्षेत्र स्वतः पत्ता लगाउने सुविधा असक्षम पारिएको छ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा असक्षम पारिएको छ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा प्रयोग गर्न मिल्दैन"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधासम्बन्धी सेटिङ परिवर्तन गर्न पाइँदैन"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi; मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न अनुप्रयोगहरूलाई Google स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र Googleमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
@@ -2519,10 +2510,8 @@
       <item quantity="one">%1$d अनुप्रयोगमा प्रतिबन्ध लगाइयो</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"यन्त्रको ब्याट्री मिटर पढ्ने क्रममा समस्या आयो"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"यन्त्रको ब्याट्री मिटर पढ्ने क्रममा समस्या आयो। थप जान्न "<annotation id="url">"मा ट्याप गर्नुहोस्"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"एपलाई रोक्ने हो?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त एपलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त एपको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त एपलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त एपको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
@@ -3585,15 +3574,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"महत्वपूर्ण वार्तालापहरू"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"वार्तालाप खण्डको सिरानमा र तैरने बबलका रूपमा देखाइयोस्"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"वार्तालाप खण्डको सिरानमा देखाइयोस्"</string>
-    <!-- no translation found for other_conversations (551178916855139870) -->
-    <skip />
+    <string name="other_conversations" msgid="551178916855139870">"कम महत्त्वपूर्ण वार्तालापहरू"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"तपाईंले केही कुराहरू परिवर्तन गर्नुभएका वार्तालापहरू"</string>
-    <!-- no translation found for recent_conversations (471678228756995274) -->
-    <skip />
-    <!-- no translation found for conversation_settings_clear_recents (7502738708058226585) -->
-    <skip />
-    <!-- no translation found for clear (5092178335409471100) -->
-    <skip />
+    <string name="recent_conversations" msgid="471678228756995274">"हालैका वार्तालापहरू"</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>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"महत्त्वपूर्ण तथा संशोधित वार्तालापहरू यहाँ देखिने छन्"</string>
@@ -4513,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ट्याब्लेटको जाँच गर्न ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"यन्त्रको जाँच गर्न ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचना र अन्य जानकारी हेर्न आफ्नो यन्त्रको स्क्रिनमा ट्याप गर्नुहोस्।"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"खतराको सङ्केत दिन प्रयोग हुने बटन"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले व्यवस्थापन गरेको"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"द्रुत रूपमा ५ पटक पावर बटन थिचेर आपत्‌कालीन उद्धार सेवामा सम्पर्क गर्नुहोस्"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"चेतावनी दिने आवाज"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"आपत्‌कालीन उद्धार सेवाहरूमा सम्पर्क गर्नुअघि अलर्ट जारी गर्नुहोस्"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाहरू प्राप्त गर्न फिंगरप्रिन्ट स्वाइप गर्नुहोस्"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिन्ट स्वाइप गर्नु"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो फोनको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
diff --git a/res/values-night/themes_suw.xml b/res/values-night/themes_suw.xml
new file mode 100644
index 0000000..16aba76
--- /dev/null
+++ b/res/values-night/themes_suw.xml
@@ -0,0 +1,28 @@
+<?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.
+  -->
+
+<!-- SUW related themes -->
+<resources>
+    <!-- DayNight themes -->
+    <style name="GlifTheme.DayNight" parent="GlifTheme" />
+    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
+    <style name="GlifV3Theme.DayNight" parent="GlifV3Theme" />
+    <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Transparent" />
+    <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Transparent" />
+    <style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Transparent" />
+    <style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat" />
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 94d85fc..8c013e2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tik om tablet te controleren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tik om apparaat te controleren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Paniekknop"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Beheerd door <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Start de SOS-acties voor noodgevallen door snel vijf keer op de aan/uit-knop te drukken."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Waarschuwingsgeluid"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Waarschuwingsgeluid voordat de acties worden gestart"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nood-SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Beheerd door <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Start de SOS-acties voor noodgevallen door snel 5 keer op de aan/uit-knop te drukken."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Waarschuwingsgeluid"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Waarschuwingsgeluid voordat de acties worden gestart"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Over vingerafdruksensor swipen voor meldingen"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Over vingerafdruk swipen"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Als je je meldingen wilt bekijken, swipe je omlaag over de vingerafdruksensor achter op je telefoon."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a2a20a1..326e99b 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -2510,10 +2510,8 @@
       <item quantity="one">%1$dଟି ଆପ୍‌କୁ ଅବରୋଧ କରାଯାଇଛି</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ମିଟର୍ ପଢ଼ିବାରେ ସମସ୍ୟା ହେଉଛି"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ମିଟର୍ ପଢ଼ିବାରେ ସମସ୍ୟା ହେଉଛି। "<annotation id="url">"ଅଧିକ ଜାଣିବାକୁ"</annotation>"ରେ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ଆପ୍‌କୁ ବନ୍ଦ କରିବେ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"ଆପଣଙ୍କ ଫୋନ୍‌ ସାମାନ୍ୟ ଭାବେ ବ୍ୟାଟେରୀ ପରିଚାଳନା କରିପାରିବ ନାହିଁ କାରଣ, ଆପଣ ଆ‌ପ୍‌ ବ୍ୟବହାର ନକରୁଥିବାବେଳେ <xliff:g id="APP">%1$s</xliff:g> ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଜାଗ୍ରତ କରି ରଖୁଛି।\n\nଏହାର ସମାଧାନସ୍ୱରୂପ, ଏହି ଆପ୍‌କୁ ଆପଣ ବନ୍ଦ କରିଦେଇପାରିବେ।\n\nଯଦି ଏହିପରି ଲାଗିରୁହେ, ତେବେ ବ୍ୟାଟେରୀର ଗତିବିଧି ବଢ଼ାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଏହି ଆପ୍‌କୁ ଅନଇନଷ୍ଟଲ୍‌ କରିବାକୁ ପଡ଼ିପାରେ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ ବ୍ୟାଟେରୀକୁ ସାଧାରଣ ଭାବେ ପରିଚାଳନା କରିପାରୁନାହିଁ କାରଣ <xliff:g id="APP">%1$s</xliff:g> ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌କୁ ଜାଗ୍ରତ କରି ରଖିଛି।\n\nଏହି ସମସ୍ୟାର ସମାଧାନ କରିବା ପାଇଁ ଆପଣ ଆପ୍‌କୁ ବନ୍ଦ କରିପାରିବେ।\n\nଯଦି ଏହିପରି ଲାଗିରୁହେ, ତେବେ ବ୍ୟାଟେରୀର କାର୍ଯ୍ୟଦକ୍ଷତାରେ ଉନ୍ନତି ଆଣିବା ପାଇଁ ଆପଣଙ୍କୁ ଆପ୍‌ଟିକୁ ଅନ୍‌ଇନ୍‌ଷ୍ଟଲ୍‌ କରିବାକୁ ପଡ଼ିବ।"</string>
@@ -4128,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> ପାଇଁ \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍‌ସେସ୍‌ ରଦ୍ଦ କରିବେ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"ଏହି ଆପ୍‌ ଦ୍ୱାରା, \"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ପାଇଁ କରାଯାଇଥିବା ସମସ୍ତ ନିୟମ କାଢ଼ିଦିଆଯିବ।"</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"ଅନୁକୁଳ କରନାହିଁ"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ଅନୁକୁଳ"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"ଅପ୍ଟିମାଇଜ୍ କରନ୍ତୁ"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ଖୁବ୍ ଶୀଘ୍ର ସରିଯାଇପାରେ। ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଆଉ ଆପ୍‍କୁ ବାଧା ଦେଇହେବ ନାହିଁ।"</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"ବ୍ୟାଟେରୀ କାମ କରିବା ସମୟ ବଢାଇବାକୁ ସୁପାରିଶ କରାଯାଇଛି"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"ବ୍ୟାଟେରୀ ଅନୁକୂଳନ ଏଡ଼ାଇବାକୁ <xliff:g id="APP">%s</xliff:g> କୁ ଅନୁମତି ଦେବେ?"</string>
@@ -4500,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ଟାବ୍‍‍ଲେଟ୍ ଯାଞ୍ଚ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ଡିଭାଇସ୍ ଯାଞ୍ଚ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନାର ଯାଞ୍ଚ କରିବା ପାଇଁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌କୁ ଟାପ୍ କରନ୍ତୁ।"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ପ୍ୟାନିକ୍ ବଟନ୍"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ଶୀଘ୍ର 5 ଥର ପାୱାର ବଟନକୁ ଦବାଇ ଜରୁରୀକାଳୀନ SOS କାର୍ଯ୍ୟଗୁଡ଼ିକ ଆରମ୍ଭ କରନ୍ତୁ।"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ଚେତାବନୀ ସାଉଣ୍ଡ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"କାର୍ଯ୍ୟ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ ଆଲର୍ଟ କରନ୍ତୁ"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ଜରୁରୀକାଳୀନ SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"ଶୀଘ୍ର 5 ଥର ପାୱାର ବଟନକୁ ଦବାଇ ଜରୁରୀକାଳୀନ SOS କାର୍ଯ୍ୟଗୁଡ଼ିକ ଆରମ୍ଭ କରନ୍ତୁ।"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"ଚେତାବନୀ ସାଉଣ୍ଡ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"କାର୍ଯ୍ୟଗୁଡ଼ିକ ଆରମ୍ଭ କରିବା ପୂର୍ବରୁ ଆଲର୍ଟ କରନ୍ତୁ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ବିଜ୍ଞପ୍ତି ପାଇଁ ଟିପଚିହ୍ନ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ଟିପଚିହ୍ନ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ, ନିଜ ଫୋନ୍‌ ପଛପଟେ ଥିବା ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ସେନ୍ସର୍‌ ଉପରେ ଆଙ୍ଗୁଠି ରଖି ତଳକୁ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ।"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 9c32d3b..b59e2b8 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2510,10 +2510,8 @@
       <item quantity="other">%1$d ਐਪਾਂ ਪ੍ਰਤੀਬੰਧਿਤ</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"ਤੁਹਾਡੇ ਬੈਟਰੀ ਮੀਟਰ ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ਤੁਹਾਡੇ ਬੈਟਰੀ ਮੀਟਰ ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ। "<annotation id="url">"ਹੋਰ ਜਾਣਨ"</annotation>" ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ਕੀ ਐਪ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
@@ -4500,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ਟੈਬਲੈੱਟ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ਡੀਵਾਈਸ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ਖਤਰੇ ਦੀ ਸੂਚਨਾ ਸੰਬੰਧੀ ਬਟਨ"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"ਪਾਵਰ ਬਟਨ ਨੂੰ ਤੇਜ਼ੀ ਨਾਲ 5 ਵਾਰ ਦੱਬ ਕੇ ਸੰਕਟਕਾਲੀਨ SOS ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰੋ।"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ਚਿਤਾਵਨੀ ਧੁਨੀ"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਸੁਚੇਤਨਾ ਦਿਓ"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6c50610..ec92580 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -3465,7 +3465,7 @@
     <string name="zen_mode_settings_category" msgid="3794956668816783447">"Zezwól na powiadomienia dźwiękowe"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokuj wyświetlanie"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Zezwól na sygnały wizualne"</string>
-    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"Opcje wyświetlania ukrytych powiadomień"</string>
+    <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"Wyświetlanie ukrytych powiadomień"</string>
     <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Po włączeniu trybu Nie przeszkadzać"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Brak dźwięku powiadomień"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Powiadomienia będą wyświetlać się na ekranie"</string>
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Kliknij, by sprawdzić tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Kliknij, by sprawdzić urządzenie"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Przycisk alarmu antywłamaniowego"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Zarządzane przez: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Uruchom działania alarmowe, naciskając przycisk zasilania 5 razy."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Dźwięk ostrzegawczy"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alert przed rozpoczęciem działania"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Sygnał SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Zarządzane przez: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Uruchom działania alarmowe, naciskając przycisk zasilania 5 razy."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Dźwięk ostrzeżenia"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alert przed rozpoczęciem działania"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sprawdzanie powiadomień odciskiem palca"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Przesuwanie po czytniku"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Aby sprawdzić powiadomienia, przesuń palcem w dół po czytniku linii papilarnych z tyłu telefonu."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e8212b1..a124c7d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocar para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para verificar a hora, as notificações e outras informações, toque na tela."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botão de pânico"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gerenciado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pressione rapidamente o botão liga/desliga cinco vezes para iniciar as ações de emergência."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Som de alerta"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Emitir alerta antes de iniciar as ações"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergência"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gerenciado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Pressione rapidamente o botão liga/desliga cinco vezes para iniciar as ações de emergência."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Som de alerta"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Emitir alerta antes de iniciar as ações"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar para baixo no sensor de impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b8d85fb..c68cc16 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toque para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toque para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar a hora, as notificações e outras informações, toque no ecrã."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botão de pânico"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gerido por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Inicie as ações SOS de emergência ao premir o botão ligar/desligar rapidamente 5 vezes."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Som de aviso"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alertar antes de iniciar as ações"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS de emergência"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gerido por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Inicie as ações SOS de emergência ao premir o botão ligar/desligar rapidamente 5 vezes."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Som de aviso"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alerte antes de iniciar as ações."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Utilizar impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e8212b1..a124c7d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocar para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para verificar a hora, as notificações e outras informações, toque na tela."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Botão de pânico"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gerenciado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Pressione rapidamente o botão liga/desliga cinco vezes para iniciar as ações de emergência."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Som de alerta"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Emitir alerta antes de iniciar as ações"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergência"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gerenciado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Pressione rapidamente o botão liga/desliga cinco vezes para iniciar as ações de emergência."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Som de alerta"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Emitir alerta antes de iniciar as ações"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar para baixo no sensor de impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 598192e..36b2a87 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -4571,11 +4571,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Atingeți pentru a verifica tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Atingeți pentru a verifica dispozitivul"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ca să verificați ora, notificările și alte informații, atingeți ecranul."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Buton de alarmă"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Gestionat de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Inițiați acțiunile de urgență apăsând rapid butonul de pornire de cinci ori."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sunet de avertizare"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Alertă înainte de începerea acțiunilor"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS urgențe"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestionat de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Inițiați acțiunile de urgență apăsând rapid butonul de pornire de cinci ori."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Sunet de avertizare"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Alertă înainte de începerea acțiunilor"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Glisați amprenta pentru notificări"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Glisați amprenta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele telefonului."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 96b9251..c0aa9ce 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Нажмите, чтобы проверить планшет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Нажмите, чтобы проверить устройство"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Чтобы увидеть время, уведомления и другую информацию, коснитесь экрана."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Кнопка panic"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Управляется приложением \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Быстро нажмите пять раз на кнопку питания, чтобы позвонить в экстренные службы"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Предупреждающий сигнал"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Включать предупреждающий сигнал перед звонком в экстренные службы"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Экстренный вызов"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Под управлением приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Чтобы позвонить в экстренные службы, нужно пять раз быстро нажать кнопку питания"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Предупреждающий сигнал"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Включать предупреждающий сигнал перед выполнением экстренного вызова"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Использовать сканер отпечатков для просмотра уведомлений"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер отпечатков"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели телефона"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 6ab45ba..a9b9874 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ටැබ්ලටය පරීක්‍ෂා කිරීමට තට්ටු කරන්න"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"උපාංගය පරීක්‍ෂා කිරීමට තට්ටු කරන්න"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්‍ෂා කිරීමට, ඔබේ තිරයට දෙවරක් තට්ටු කරන්න."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ව්‍යාකූල බොත්තම"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"බල බොත්තම 5 වතාවක් ඉක්මනින් එබීමෙන් හදිසි SOS ක්‍රියා ආරම්භ කරන්න."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"ඇඟවීමේ ශබ්දය"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"ක්‍රියා ආරම්භ කිරීමට පෙර ඇඟවීම"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"හදිසි SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"බල බොත්තම 5 වතාවක් ඉක්මනින් එබීමෙන් හදිසි SOS ක්‍රියා ආරම්භ කරන්න."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"අනතුරු ඇඟවීමේ ශබ්දය"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"ක්‍රියා ආරම්භ කිරීමට පෙර ඇඟවීම"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"දැනුම්දීම් සඳහා ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2edd515..90337ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Klepnutím skontrolujete tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Klepnutím skontrolujete zariadenie"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, klepnite na obrazovku."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Tlačidlo zvukového alarmu"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Spravované aplikáciou <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Akcie na privolanie pomoci v tiesni spustíte tak, že päťkrát rýchlo stlačíte vypínač."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Zvuk upozornenia"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Upozornenie pred spustením akcie"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Tiesňové SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Spravované aplikáciou <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Akcie na privolanie pomoci v tiesni spustíte tak, že päťkrát rýchlo stlačíte vypínač."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Zvuk upozornenia"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Upozornenie pred spustením akcie"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Upozornenia odtlačkom prsta"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Potiahnutie prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Upozornenia zobrazíte potiahnutím nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e3a818d..b03b723 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dotik za preverjanje tabličnega računalnika"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dotik za preverjanje naprave"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Če želite preveriti uro, obvestila in druge informacije, se dotaknite zaslona."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Gumb za paniko"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Upravlja: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Zaženite SOS dejanja v sili tako, da petkrat hitro pritisnete gumb za vklop."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Opozorilni zvok"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Sproži zvočno opozorilo pred ukrepanjem"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nujni primer"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Zaženite dejanja za nujne primere tako, da petkrat hitro pritisnete gumb za vklop."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Opozorilni zvok"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Sproži zvočno opozorilo pred ukrepanjem"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Poteg s prstom po tipalu prstnih odtisov za prikaz obvestil"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Poteg po prstnem tipalu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani telefona."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 65e12b4..b654713 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2510,10 +2510,8 @@
       <item quantity="one">%1$d aplikacion i kufizuar</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem me leximin e matësit të baterisë"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem me leximin e matësit të baterisë. Trokit "<annotation id="url">"për të mësuar më shumë"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Të ndalohet aplikacioni?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar telefonin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar tabletin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
@@ -4500,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Trokit për të kontrolluar tabletin"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Trokit për të kontrolluar pajisjen"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, trokit tek ekrani."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Butoni i panikut"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Menaxhohet nga <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Nis veprimet SOS të urgjencës duke shtypur butonin e energjisë me shpejtësi 5 herë."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Tingull paralajmërues"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Sinjalizim përpara nisjes së veprimeve"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS i urgjencës"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Menaxhohet nga <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Nis veprimet SOS të urgjencës duke shtypur butonin e energjisë me shpejtësi 5 herë."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Tingull paralajmërues"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Sinjalizim përpara nisjes së veprimeve"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Rrëshqit gjurmën e gishtit për njoftimet"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Rrëshqit gjurmën e gishtit"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fd453d3..778952a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -4571,11 +4571,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Додирните да бисте проверили таблет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Додирните да бисте проверили уређај"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Да бисте проверили време, обавештења и друге информације, додирните екран."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Дугме аларма за панику"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Управља <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Да бисте покренули радње за хитне случајеве, брзо додирните дугме за укључивање 5 пута."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Звук упозорења"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Упозорење пре почетка радњи"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Хитни случајеви"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Управља <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Да бисте покренули радње за хитне случајеве, брзо додирните дугме за укључивање 5 пута."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Звук упозорења"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Упозорење пре почетка радњи"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Превуците прстом за обавештења"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Превуците прстом"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни телефона."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 13b767a..a765a7e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tryck för att kolla surfplattan"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tryck för att kolla enheten"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Visa tid, aviseringar och annan information genom att trycka på skärmen."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panikknapp"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Hanteras av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Starta åtgärderna för nödsituationer genom att trycka på strömbrytaren snabbt fem gånger."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Varningsljud"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Aktivera ett varningsljud innan du startar åtgärderna"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS för nödsituationer"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Hanteras av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Starta åtgärderna för nödsituationer genom att trycka på strömbrytaren snabbt fem gånger."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Varningsljud"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Aktivera ett varningsljud innan du startar åtgärderna"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Svep över fingeravtryckssensorn för aviseringar"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Svep över fingeravtryckssensorn"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av telefonen."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9a73a6c..5e59056 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Gusa ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Gusa ili uangalie kifaa"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ili uangalie saa, arifa na maelezo mengine, gusa skrini yako."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Kitufe cha kengele ya kushtua"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Inadhibitiwa na <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Anzisha vitendo vya dharura vya SOS kwa kubonyeza kitufe cha kuwasha/kuzima haraka mara tano."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Sauti ya onyo"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Arifu kabla ya kuanza kutekeleza vitendo"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Ujumbe wa Dharura"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Inadhibitiwa na <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Anzisha vitendo vya dharura vya SOS kwa kubonyeza kitufe cha kuwasha/kuzima haraka mara tano."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Sauti ya onyo"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Arifu kabla ya kuanza kutekeleza vitendo"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Telezesha kidole ili upate arifa"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Telezesha kidole"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa simu yako."</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index db04ed3..843de35 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -4126,7 +4126,7 @@
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g>க்கான தொந்தரவு செய்ய வேண்டாம் அணுகலை ரத்துசெய்யவா?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"இந்த ஆப்ஸ் உருவாக்கிய தொந்தரவு செய்ய வேண்டாம் விதிகள் அனைத்தும் அகற்றப்படும்."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"மேம்படுத்த வேண்டாம்"</string>
-    <string name="ignore_optimizations_off" msgid="9186557038453586295">"மேம்படுத்து"</string>
+    <string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimize"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"பேட்டரியை மிக விரைவாகத் தீர்த்துவிடக்கூடும். பின்னணியில் பேட்டரியைப் பயன்படுத்துவதிலிருந்து, ஆப்ஸ் இனி தடுக்கப்படாது."</string>
     <string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"பேட்டரி அதிக நேரம் நீடிப்பதற்காகப் பரிந்துரைக்கப்படுகிறது"</string>
     <string name="ignore_optimizations_title" msgid="3464172726254542889">"பேட்டரி மேம்படுத்தல்களைத் தவிர்க்க, <xliff:g id="APP">%s</xliff:g>ஐ அனுமதிக்கவா?"</string>
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்கத் தட்டவும்"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்கத் தட்டவும்"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்கத் திரையைத் தட்டவும்."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ஆபத்துக் காலங்களில் பயன்படுத்துவதற்கான பட்டன்"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"நிர்வகிப்பது: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"பவர் பட்டனை விரைவாக 5 முறை அழுத்துவதன் மூலம் அவசரகால SOS செயல்களைத் தொடங்கலாம்."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"எச்சரிக்கை ஒலி"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"செயல்களைத் தொடங்கும் முன் விழிப்பூட்டும்"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"அவசரகால SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"நிர்வகிப்பது: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"பவர் பட்டனை விரைவாக 5 முறை அழுத்துவதன் மூலம் அவசரகால SOS செயல்களைத் தொடங்கலாம்."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"எச்சரிக்கை ஒலி"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"செயல்களைத் தொடங்கும் முன் விழிப்பூட்டும்"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"அறிவிப்புகளைப் பெற சென்சாரில் ஸ்வைப் செய்தல்"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"கைரேகை ஸ்வைப்"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை சென்சாரில் கீழ் நோக்கி ஸ்வைப் செய்தல்."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f722a46..aec625d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1734,24 +1734,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"బ్లూటూత్ స్కానింగ్"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను, సేవలను అనుమతించండి. ఉదాహరణకు, లొకేషన్ ఆధారిత ఫీచర్‌లు, సేవలను మెరుగుపరచడానికి దీనిని ఉపయోగించవచ్చు."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ఆఫీస్ కోసం స్థాన సేవలు"</string>
-    <!-- no translation found for location_time_zone_detection_screen_title (8396625087466311625) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_title (1195178875042989835) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_enabled_description (1064716900984397624) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_on (5514817179120761597) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_off (192427076195667079) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_auto_is_off (8067073548483627695) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_applicable (6757964612836952714) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_supported (3251181656388306501) -->
-    <skip />
-    <!-- no translation found for location_time_zone_detection_not_allowed (8264525161514617051) -->
-    <skip />
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ప్రస్తుత టైమ్ జోన్‌ను గుర్తించడానికి పరికరం‌ యొక్క లొకేషన్‌ను ఉపయోగించడానికి అనుమతిస్తుంది. Wi‑Fi స్కానింగ్ వంటి ఇతర లొకేషన్ సెట్టింగ్‌లు టైమ్ జోన్ గుర్తింపు యొక్క ఖచ్చితత్వాన్ని ప్రభావితం చేస్తాయి."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ఆన్‌లో ఉంది"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ఆఫ్‌లో ఉంది"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ఆటోమేటిక్ టైమ్ జోన్ గుర్తింపు డిజేబుల్ చేయబడింది"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"లొకేషన్ టైమ్ జోన్ గుర్తింపు డిజేబుల్ చేయబడింది"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"లొకేషన్ టైమ్ జోన్ గుర్తింపుకు మద్దతు లేదు"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"లొకేషన్ టైమ్ జోన్ గుర్తింపు మార్పులు అనుమతించబడవు"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; మొబైల్ నెట్‌వర్క్ స్థానం"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"మీ స్థానాన్ని వేగవంతంగా అంచనా వేయడం కోసం Google స్థాన సేవను ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి. అనామక స్థాన డేటా సేకరించబడుతుంది మరియు Googleకు పంపబడుతుంది."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"స్థానం Wi‑Fi ద్వారా గుర్తించబడింది"</string>
@@ -3583,15 +3574,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ప్రాధాన్య సంభాషణలు"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"సంభాషణల విభాగంలో ఎగువున చూపబడుతుంది, తేలుతున్న బబుల్స్‌లా కనిపిస్తుంది"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"సంభాషణ విభాగంలో ఎగువున చూపబడుతుంది"</string>
-    <!-- no translation found for other_conversations (551178916855139870) -->
-    <skip />
+    <string name="other_conversations" msgid="551178916855139870">"ప్రాధాన్యత లేని సంభాషణలు"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"మీరు మార్పులు చేసిన సంభాషణలు"</string>
-    <!-- no translation found for recent_conversations (471678228756995274) -->
-    <skip />
-    <!-- no translation found for conversation_settings_clear_recents (7502738708058226585) -->
-    <skip />
-    <!-- no translation found for clear (5092178335409471100) -->
-    <skip />
+    <string name="recent_conversations" msgid="471678228756995274">"ఇటీవలి సంభాషణలు"</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>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ప్రముఖమైన, మార్పులు చేసిన సంభాషణలు ఇక్కడ కనిపిస్తాయి"</string>
@@ -4513,11 +4500,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"టాబ్లెట్‌ను తనిఖీ చేయడానికి నొక్కండి"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"పరికరాన్ని తనిఖీ చేయడానికి నొక్కండి"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"సమయం, నోటిఫికేషన్‌లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడానికి నొక్కండి."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ఎమర్జెన్సీ బటన్"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g>తో మేనేజ్ చేయబడింది"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"పవర్ బటన్‌ను వెంట వెంటనే 5 సార్లు నొక్కడం ద్వారా ఎమర్జెన్సీ SOS చర్యలను ప్రారంభించండి."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"హెచ్చరిక సౌండ్"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"చర్యలను ప్రారంభించడానికి ముందు అలర్ట్ చేయండి"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ఎమర్జెన్సీ SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ద్వారా మేనేజ్ చేయబడింది"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"పవర్ బటన్‌ను వెంటవెంటనే 5 సార్లు నొక్కడం ద్వారా ఎమర్జెన్సీ SOS చర్యలను ప్రారంభించండి."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"హెచ్చరిక సౌండ్"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"చర్యలను ప్రారంభించడానికి ముందు అలర్ట్ చేయండి"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"నోటిఫికేషన్‌ల కోసం వేలిముద్రతో స్వైప్ చేయండి"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"వేలిముద్రతో స్వైప్ చేయి"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"మీ నోటిఫికేషన్‌లను తనిఖీ చేయడానికి, మీ ఫోన్ వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్‌పై కిందికి స్వైప్ చేయండి."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ef2b924..f073d38 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"แตะเพื่อดูแท็บเล็ต"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"แตะเพื่อดูอุปกรณ์"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอ"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ปุ่มสัญญาณเตือนภัย"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"จัดการโดย <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"เริ่มการดำเนินการขอความช่วยเหลือฉุกเฉินโดยกดปุ่มเปิด/ปิดเร็วๆ 5 ครั้ง"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"เสียงเตือน"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"การแจ้งเตือนก่อนเริ่มดำเนินการ"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ขอความช่วยเหลือฉุกเฉิน"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"จัดการโดย <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"เริ่มการดำเนินการขอความช่วยเหลือฉุกเฉินโดยกดปุ่มเปิด/ปิดเร็วๆ 5 ครั้ง"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"เสียงเตือน"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"การแจ้งเตือนก่อนเริ่มดำเนินการ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"เลื่อนนิ้วสแกนลายนิ้วมือ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0009d13..f05430e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"I-tap para suriin ang tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"I-tap para suriin ang device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para tingnan ang oras, mga notification, at iba pang impormasyon, i-tap ang iyong screen."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panic button"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Pinapamahalaan ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Simulan ang mga pang-emergency na SOS na pagkilos sa pamamagitan ng mabilis na pagpindot sa power button nang 5 beses."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Pambabalang tunog"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Mag-alerto bago ang pagsisimula ng mga pagkilos"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Pang-emergency na SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Pinapamahalaan ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Simulan ang mga pang-emergency na SOS na pagkilos sa pamamagitan ng mabilis na pagpindot sa power button nang 5 beses."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Pambabalang tunog"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Mag-alerto bago simulan ang mga pagkilos"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"I-swipe ang fingerprint para sa mga notification"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"I-swipe ang fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng telepono mo."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 56e5a3b..f793c98 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tableti kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Cihazı kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza dokunun."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Panik düğmesi"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> tarafından yönetiliyor"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Güç düğmesine hızlı bir şekilde 5 kez basarak acil durum yardım isteme işlemlerini başlatın."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Uyarı sesi"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"İşlemleri başlatmadan önce uyar"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Acil Durum SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> tarafından yönetiliyor"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Güç düğmesine hızlı bir şekilde 5 kez basarak acil durum yardım isteme işlemlerini başlatın."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Uyarı sesi"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"İşlemleri başlatmadan önce uyar"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirimler için parmak izini kaydırın"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Parmak izini kaydırın"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirimlerinizi kontrol etmek için telefonunuzun arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 135ec2a..9344bcb 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -4644,11 +4644,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Торкніться, щоб перевірити пристрій"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Щоб перевірити час, сповіщення та іншу інформацію, торкніться екрана."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Кнопка тривоги"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Керує додаток <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Щоб розпочати екстрені дії, швидко натисніть кнопку живлення 5 разів."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Попереджувальний звуковий сигнал"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Сповіщати, перш ніж розпочинати дії"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Екстрене сповіщення"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Керує <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Щоб розпочати екстрені дії, швидко натисніть кнопку живлення 5 разів."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Попереджувальний звуковий сигнал"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Сповіщати, перш ніж розпочинати дії"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Використовувати відбиток пальця для перегляду сповіщень"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер відбитків"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі телефона."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index ee8364f..ca7864f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2510,10 +2510,8 @@
       <item quantity="one">‏%1$d ایپ پر پابندی لگائی گئی</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
-    <!-- no translation found for battery_missing_message (5202575301365811053) -->
-    <skip />
-    <!-- no translation found for battery_missing_help_message (4583322687535428926) -->
-    <skip />
+    <string name="battery_missing_message" msgid="5202575301365811053">"آپ کے بیٹری میٹر کو پڑھنے میں دشواری"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"آپ کے بیٹری میٹر کو پڑھنے میں دشواری۔ "<annotation id="url">"مزید جاننے"</annotation>" کیلئے تھپتھپائیں"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ایپ بند کریں؟"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے فون کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے ٹیبلیٹ کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
@@ -4500,11 +4498,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ٹیبلیٹ چیک کرنے کے لیے تھپتھپائیں"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"آلہ چیک کرنے کے لیے تھپتھپائیں"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"ڈرانے کا بٹن"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے زیر انتظام ہے"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"‏5 بار پاور بٹن کو تیزی سے دبا کر کے ہنگامی SOS کاروائیوں کو شروع کریں۔"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"وارننگ کی آواز"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"کارروائیاں شروع کرنے سے پہلے الرٹ"</string>
+    <!-- no translation found for emergency_gesture_screen_title (3280543310204360902) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_entrypoint_summary (4730874229911208834) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_screen_summary (1412270517879718683) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_title (9106060038248836408) -->
+    <skip />
+    <!-- no translation found for emergency_gesture_sound_setting_summary (7086534195960716320) -->
+    <skip />
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"اطلاعات کیلئے فنگر پرنٹ سوائپ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"فنگر پرنٹ سوائپ کریں"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"اپنی اطلاعات چیک کرنے کیلئے اپنے فون کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 5a2ff33..5840bb0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planshetni tekshirish uchun bosing"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Qurilmani tekshirish uchun bosing"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Vaqt, bildirishnoma va boshqa axborotni tekshirish uchun ekranni bosing."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Vahima tugmasi"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"<xliff:g id="APP_NAME">%1$s</xliff:g> tomonidan boshqariladi"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Favqulodda SOS chaqiruvlarini amalga oshirish uchun oʻchirib-yoqish tugmasini tez-tez 5 marta bosing."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Ogohlantiruvchi signal"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Favqulodda xizmatlarga telefon qilishdan oldin ogohlantiruvchi signalni yoqish"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS Favqulodda holat"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> tomonidan boshqariladi"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Favqulodda SOS chaqiruvlarini amalga oshirish uchun oʻchirib-yoqish tugmasini tez-tez 5 marta bosing."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Ogohlantiruvchi signal"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Favqulodda xizmatlarga telefon qilishdan oldin ogohlantiruvchi signalni yoqish"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirishnomalarni barmoq izi bilan ochish"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Barmoq izi skaneri"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2b3566c..506f7fd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Nhấn để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Nhấn để kiểm tra thiết bị"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Để xem thời gian, thông báo và thông tin khác, hãy nhấn vào màn hình."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Nút hoảng loạn"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Do <xliff:g id="APP_NAME">%1$s</xliff:g> quản lý"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Bật tính năng SOS khẩn cấp bằng cách nhấn nhanh nút nguồn 5 lần."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Âm cảnh báo"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Cảnh báo trước khi bắt đầu các thao tác"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS khẩn cấp"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Do <xliff:g id="APP_NAME">%1$s</xliff:g> quản lý"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Bật tính năng SOS khẩn cấp bằng cách nhấn nhanh nút nguồn 5 lần."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Âm cảnh báo"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Cảnh báo trước khi bắt đầu các thao tác"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Vuốt cảm biến vân tay để xem thông báo"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Vuốt vân tay"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 83d06fd..b750933 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"点按即可查看平板电脑相关信息"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"点按即可查看设备相关信息"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"要查看时间、通知和其他信息,请点按您的屏幕。"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"紧急按钮"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"快速按电源按钮 5 次即可启动紧急 SOS 操作。"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警报声"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"在触发操作前发出警报声"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"紧急求救"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"快速按电源按钮 5 次即可启动紧急求救操作。"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"警报声"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"在触发操作前发出警报声"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"滑动指纹即可查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑动指纹"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"要查看通知,请在手机背面的指纹传感器上向下滑动手指。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a53220e..4bbda48 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -4499,11 +4499,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"輕按即可查看平板電腦"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"輕按即可查看裝置"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"輕按螢幕即可查看時間、通知和其他資訊。"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"緊急按鈕"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"快速按下電源按鈕 5 次即可觸發緊急求救動作。"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警示音效"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"開始操作前響起警示"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"緊急求救"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"快速按下電源按鈕 5 次即可觸發緊急求救動作。"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"警示音效"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"開始操作前響起警示"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"在指紋感應器上滑動以查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑動指紋"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"如要查看通知,請在手機背面的指紋感應器上向下滑動。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 549d4c0..147cc078 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -4498,11 +4498,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"輕觸以查看平板電腦"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"輕觸以查看裝置"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"如要查看時間、通知和其他資訊,請輕觸螢幕。"</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"緊急按鈕"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"快速按下電源按鈕 5 次即可觸發緊急求救動作。"</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"警報聲"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"在觸發動作前發出警報聲"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"緊急求救"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"快速按下電源按鈕 5 次即可觸發緊急求救動作。"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"警報聲"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"在觸發動作前發出警報聲"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"滑動指紋感應器以查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑動手指"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"將手指放在手機背面的指紋感應器上並向下滑動,即可查看通知。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ced64f4..a42a282 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -4499,11 +4499,11 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Thepha ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Thepha ukuze uhlole idivayisi"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, thepha isikrini sakho."</string>
-    <string name="panic_gesture_screen_title" msgid="2978368688339171290">"Inkinobho yokwesaba"</string>
-    <string name="panic_gesture_entrypoint_summary" msgid="7780062003951380630">"Iphethwe yi-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="panic_gesture_screen_summary" msgid="6560595108396726608">"Qala izenzo ze-SOS yesimo esiphuthumayo ngokucindezela inkinobho yamandla ngokushesha izikhathi ezi-5."</string>
-    <string name="panic_gesture_sound_setting_title" msgid="2235527774130891208">"Umsindo wesexwayiso"</string>
-    <string name="panic_gesture_sound_setting_summary" msgid="6997197208264987249">"Isexwayiso ngaphambi kokuqalisa izenzo"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Isimo esiphuthumayo se-SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Iphethwe yi-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="1412270517879718683">"Qala izenzo ze-SOS yesimo esiphuthumayo ngokucindezela inkinobho yamandla ngokushesha izikhathi ezi-5."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="9106060038248836408">"Umsindo wesexwayiso"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="7086534195960716320">"Isexwayiso ngaphambi kokuqalisa izenzo"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swayipha izigxivizo zeminwe ukuze uthole izaziso"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swayipha izigxivizo zeminwe"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwefoni yakho."</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index acc7f51..aeade3a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8258,6 +8258,12 @@
     <string name="asst_feedback_indicator_summary">Indicate adjustments made to notifications and show the option to provide feedback to the system</string>
 
     <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
+    <string name="asst_importance_reset_title">Reset notification importance</string>
+
+    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
+    <string name="asst_importance_reset_summary">Reset user changed importance settings and allow notification assistant to prioritize</string>
+
+    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
     <string name="asst_capabilities_actions_replies_title">Suggested actions and replies</string>
 
     <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
@@ -11975,6 +11981,30 @@
     <string name="see_less">See less</string>
 
     <!-- Strings for toggling subscriptions dialog activity -->
+    <!-- Title of confirmation dialog asking the user if they want to enable subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sub_dialog_title">Turn on <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+    <!-- Title of confirmation dialog asking the user if they want to enable subscription without the subscription name. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name">Turn on SIM?</string>
+    <!-- Title of confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_title">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+    <!-- Title of confirmation dialog asking the user if they want to switch to the SIM card. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_psim_dialog_title">Switch to using SIM card?</string>
+    <!-- Body text of confirmation dialog for switching subscription that involves switching SIM slots. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_text">Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
+    <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one downloaded SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_text_downloaded">Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
+    <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_text_single_sim">Only one SIM can be active at a time.\n\nSwitching won\u2019t cancel your <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> service.</string>
+    <!-- Text of confirm button in the confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_confirm">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <!-- Status message indicating the device is in the process of disconnecting from one mobile network and immediately connecting to another. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enabling_sim_without_carrier_name">Connecting to network&#8230;</string>
+    <!-- Text of progress dialog indicating the subscription switch is in progress. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_progress">Switching to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <!-- Title of error message indicating that the device could not disconnect from one mobile network and immediately connect to another. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sim_fail_title">Can\u2019t switch carrier</string>
+    <!-- Body text of error message indicating the device could not disconnect from one mobile network and immediately connect to another, due to an unspecified issue. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sim_fail_text">The carrier can\u2019t be switched due to an error.</string>
     <!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
     <string name="privileged_action_disable_sub_dialog_title">Turn off <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
     <!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
@@ -11982,9 +12012,31 @@
     <!-- Disabling SIMs progress dialog message [CHAR LIMIT=NONE] -->
     <string name="privileged_action_disable_sub_dialog_progress">Turning off SIM<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string>
     <!-- Title of error messaging indicating the device could not disable the mobile network. [CHAR LIMIT=NONE] -->
-    <string name="privileged_action_disable_fail_title">Can\'t disable carrier</string>
+    <string name="privileged_action_disable_fail_title">Can\u2019t disable carrier</string>
     <!-- Body text of error message indicating the device could not disable the mobile network, due to an unknown issue. [CHAR LIMIT=NONE] -->
     <string name="privileged_action_disable_fail_text">Something went wrong and your carrier could not be disabled.</string>
+    <!-- Title on a dialog asking the users whether they want to enable DSDS mode. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_enable_dsds_title">Use 2 SIMs?</string>
+    <!-- Message in a dialog indicating the user can enable DSDS mode. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_enable_dsds_text">This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\".</string>
+    <!-- Ask the user whether to restart device. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_restart_title">Restart device?</string>
+    <!-- Tell the user that in order to enable DSDS mode, the phone needs to restart. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_restart_text">To get started, restart your device. Then you can add another SIM.</string>
+    <!-- Button on a dialog to confirm SIM operations. [CHAR LIMIT=30] -->
+    <string name="sim_action_continue">Continue</string>
+    <!-- User confirms reboot the phone. [CHAR LIMIT=30] -->
+    <string name="sim_action_reboot">Restart</string>
+    <!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] -->
+    <string name="sim_action_no_thanks">No thanks</string>
+    <!-- Button which will disconnect the user from one mobile network and immediately connect to another. [CHAR LIMIT=30] -->
+    <string name="sim_switch_button">Switch</string>
+    <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->
+    <string name="dsds_activation_failure_title">Can\u2019t activate SIM</string>
+    <!-- Body text of DSDS activation failure dialog. Users could reinsert the SIM card or reboot to recover. [CHAR LIMIT=NONE] -->
+    <string name="dsds_activation_failure_body_msg1">Remove the SIM and insert it again. If the problem continues, restart your device.</string>
+    <!-- Body text of DSDS activation failure dialog. Users could toggle the selected SIM again or reboot to recover. [CHAR LIMIT=NONE] -->
+    <string name="dsds_activation_failure_body_msg2">Try turning on the SIM again. If the problem continues, restart your device.</string>
 
     <!-- Strings for deleting eUICC subscriptions dialog activity -->
     <!-- Title on confirmation dialog asking the user if they want to erase the downloaded SIM from the device. [CHAR_LIMIT=NONE] -->
@@ -12345,4 +12397,27 @@
     <string name="bluetooth_setting_on">On</string>
     <!-- Switch text for bluetooth feature being off [CHAR LIMIT=NONE] -->
     <string name="bluetooth_setting_off">Off</string>
+
+    <!-- Provider Model: Internet controls settings screen, item title to go into the networks settings -->
+    <string name="provider_internet_settings">Internet</string>
+    <!-- Provider Model: SIMs controls settings screen, item title to go into the SIMs settings -->
+    <string name="provider_network_settings_title">SIMs</string>
+    <!-- Provider Model: Airplane-safe networks controls settings screen -->
+    <string name="airplane_safe_networks">Airplane-safe networks</string>
+    <!-- Provider Model: Summary for airplane-safe networks -->
+    <string name="airplane_safe_networks_summary">Find and connect to airplane\u2011safe networks</string>
+    <!-- Provider Model: List of synonyms for the airplane-safe networks, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_airplane_safe_networks">airplane, airplane-safe</string>
+    <!-- Provider Model: Calls and SMS controllers settings screen, item title to go into the Calls and SMS settings -->
+    <string name="calls_and_sms">Calls &amp; SMS</string>
+    <!-- Provider Model: Name for call settings category [CHAR LIMIT=NONE] -->
+    <string name="calls_and_sms_category">Wi\u2011Fi Calling</string>
+    <!-- Provider Model: Summary for calling preference -->
+    <string name="calls_sms_wfc_summary">Make and receive calls over non-carrier networks like Wi\u2011Fi</string>
+    <!-- Provider Model: Label for footnote on calling preference -->
+    <string name="calls_sms_footnote">Wi-Fi calling allows you to make and receive calls over non-carrier networks such as some Wi\u2011Fi networks.\n\nCross-SIM calling allows you to leverage the mobile data of a SIM to make and receive calls from another SIM.</string>
+    <!-- Provider Model: Calls preference title -->
+    <string name="calls_preference_title">Calls</string>
+    <!-- Provider Model: SMS preference title -->
+    <string name="sms_preference_title">SMS</string>
 </resources>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 3c171a1..98ab28d 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -211,4 +211,13 @@
         <item name="colorAccent">@*android:color/accent_device_default_light</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
-</resources>
+
+    <!-- DayNight themes -->
+    <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
+    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
+    <style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />
+    <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />
+    <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />
+    <style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Light.Transparent" />
+    <style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat.Light" />
+</resources>
\ No newline at end of file
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index cb3e589..46bd305 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -610,6 +610,13 @@
             android:title="@string/asst_feedback_indicator_title"
             settings:controller="com.android.settings.notification.AssistantFeedbackPreferenceController" />
 
+        <com.android.settingslib.widget.LayoutPreference
+            android:key="asst_importance_reset"
+            android:title="@string/asst_importance_reset_title"
+            android:selectable="false"
+            android:layout="@layout/reset_importance_button"
+            settings:controller="com.android.settings.notification.ImportanceResetPreferenceController" />
+
         <Preference
             android:key="inactive_apps"
             android:title="@string/inactive_apps_title"
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
new file mode 100644
index 0000000..b4086fc
--- /dev/null
+++ b/res/xml/network_provider_calls_sms.xml
@@ -0,0 +1,51 @@
+<?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.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="calls_and_sms_screen"
+    android:title="@string/calls_and_sms">
+
+    <ListPreference
+        android:key="calls_preference"
+        android:title="@string/calls_preference_title"
+        settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController"
+        android:order="10"
+        />
+
+    <ListPreference
+        android:key="sms_preference"
+        android:title="@string/sms_preference_title"
+        settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"
+        android:order="15"
+        />
+
+    <PreferenceCategory
+        android:key="provider_model_calling_category"
+        android:title="@string/calls_and_sms_category"
+        android:order="20"
+        settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController"
+        settings:allowDividerAbove="true"
+        />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="calls_sms_footer"
+        android:title="@string/calls_sms_footnote"
+        android:selectable="false"
+        settings:searchable="false"
+        />
+</PreferenceScreen>
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
new file mode 100644
index 0000000..3e798ab
--- /dev/null
+++ b/res/xml/network_provider_internet.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="network_provider_and_internet_screen"
+    android:title="@string/network_dashboard_title"
+    settings:initialExpandedChildrenCount="5">
+
+    <com.android.settings.widget.PrimarySwitchPreference
+        android:fragment="com.android.settings.wifi.WifiSettings"
+        android:key="main_toggle_wifi"
+        android:title="@string/provider_internet_settings"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_settings_wireless"
+        android:order="-30"
+        settings:allowDividerAbove="true">
+        <intent
+            android:action="android.settings.WIFI_SETTINGS"
+            android:targetClass="Settings$WifiSettingsActivity" />
+    </com.android.settings.widget.PrimarySwitchPreference>
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="calls_and_sms"
+        android:title="@string/calls_and_sms"
+        android:icon="@drawable/ic_network_cell"
+        android:order="-20"
+        android:summary="@string/summary_placeholder"
+        settings:allowDividerBelow="true"
+        settings:keywords="@string/calls_and_sms"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.widget.AddPreference
+        android:key="mobile_network_list"
+        android:title="@string/provider_network_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_network_cell"
+        android:order="-15"
+        settings:keywords="@string/keywords_more_mobile_networks"
+        settings:userRestriction="no_config_mobile_networks"
+        settings:allowDividerAbove="true"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="airplane_mode"
+        android:title="@string/airplane_mode"
+        android:icon="@drawable/ic_airplanemode_active"
+        android:disableDependentsState="true"
+        android:order="-5"
+        settings:controller="com.android.settings.network.AirplaneModePreferenceController"
+        settings:userRestriction="no_airplane_mode"/>
+
+    <SwitchPreference
+        android:key="airplane_safe_networks"
+        android:title="@string/airplane_safe_networks"
+        android:icon="@drawable/ic_airplanemode_active"
+        android:order="-4"
+        android:summary="@string/airplane_safe_networks_summary"
+        settings:controller="com.android.settings.network.AirplaneSafeNetworkModePreferenceController"
+        settings:keywords="@string/keywords_airplane_safe_networks" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="manage_mobile_plan"
+        android:title="@string/manage_mobile_plan_title"
+        android:persistent="false"
+        android:order="0"
+        settings:userRestriction="no_config_mobile_networks"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.TetherSettings"
+        android:key="tether_settings"
+        android:title="@string/tether_settings_title_all"
+        android:icon="@drawable/ic_wifi_tethering"
+        android:order="5"
+        android:summary="@string/summary_placeholder"
+        settings:keywords="@string/keywords_hotspot_tethering"
+        settings:userRestriction="no_config_tethering"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.widget.PrimarySwitchPreference
+        android:fragment="com.android.settings.AllInOneTetherSettings"
+        android:key="all_tether_settings"
+        android:title="@string/tether_settings_title_all"
+        android:icon="@drawable/ic_wifi_tethering"
+        android:order="6"
+        android:summary="@string/summary_placeholder"
+        settings:controller="com.android.settings.network.AllInOneTetherPreferenceController"
+        settings:keywords="@string/keywords_hotspot_tethering"
+        settings:userRestriction="no_config_tethering"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.datausage.DataSaverPreference
+        android:key="restrict_background_parent_entry"
+        android:title="@string/data_saver_title"
+        android:icon="@drawable/ic_settings_data_usage"
+        android:order="10"
+        android:fragment="com.android.settings.datausage.DataSaverSummary"/>
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.vpn2.VpnSettings"
+        android:key="vpn_settings"
+        android:title="@string/vpn_settings_title"
+        android:icon="@drawable/ic_vpn_key"
+        android:order="15"
+        android:summary="@string/summary_placeholder"
+        settings:userRestriction="no_config_vpn"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.network.PrivateDnsModeDialogPreference
+        android:key="private_dns_settings"
+        android:title="@string/select_private_dns_configuration_title"
+        android:order="20"
+        android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
+        android:dialogLayout="@layout/private_dns_mode_dialog"
+        android:positiveButtonText="@string/save"
+        android:negativeButtonText="@android:string/cancel" />
+
+    <Preference
+        android:fragment="com.android.settings.network.AdaptiveConnectivitySettings"
+        android:key="adaptive_connectivity"
+        android:title="@string/adaptive_connectivity_title"
+        android:summary="@string/summary_placeholder"
+        android:order="25"
+        settings:controller="com.android.settings.network.AdaptiveConnectivityPreferenceController"/>
+</PreferenceScreen>
diff --git a/src/com/android/settings/AsyncTaskSidecar.java b/src/com/android/settings/AsyncTaskSidecar.java
new file mode 100644
index 0000000..31c8298
--- /dev/null
+++ b/src/com/android/settings/AsyncTaskSidecar.java
@@ -0,0 +1,66 @@
+/*
+ * 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;
+
+import android.os.AsyncTask;
+
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.concurrent.Future;
+
+/** A {@link SidecarFragment} which uses an {@link AsyncTask} to perform background work. */
+public abstract class AsyncTaskSidecar<Param, Result> extends SidecarFragment {
+
+    private Future<Result> mAsyncTask;
+
+    @Override
+    public void onDestroy() {
+        if (mAsyncTask != null) {
+            mAsyncTask.cancel(true /* mayInterruptIfRunning */);
+        }
+
+        super.onDestroy();
+    }
+
+    /**
+     * Executes the background task.
+     *
+     * @param param parameters passed in from {@link #run}
+     */
+    protected abstract Result doInBackground(@Nullable Param param);
+
+    /** Handles the background task's result. */
+    protected void onPostExecute(Result result) {}
+
+    /** Runs the sidecar and sets the state to RUNNING. */
+    public void run(@Nullable final Param param) {
+        setState(State.RUNNING, Substate.UNUSED);
+
+        if (mAsyncTask != null) {
+            mAsyncTask.cancel(true /* mayInterruptIfRunning */);
+        }
+
+        mAsyncTask =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> {
+                            Result result = doInBackground(param);
+                            ThreadUtils.postOnMainThread(() -> onPostExecute(result));
+                        });
+    }
+}
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index c65cda7..4ab197d 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -62,8 +62,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index bce6f3f..e0292ef 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -19,6 +19,7 @@
 import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_FIRST_RUN;
 import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
@@ -39,25 +40,39 @@
         return theme;
     }
 
-    public static int getTheme(Intent intent) {
+    public static int getTheme(Context context, Intent intent) {
         String theme = getThemeString(intent);
         // TODO(yukl): Move to ThemeResolver and add any additional required attributes in
         // onApplyThemeResource using Theme overlays
         if (theme != null) {
             if (WizardManagerHelper.isAnySetupWizard(intent)) {
-                switch (theme) {
-                    case ThemeHelper.THEME_GLIF_V3_LIGHT:
-                        return R.style.GlifV3Theme_Light;
-                    case ThemeHelper.THEME_GLIF_V3:
-                        return R.style.GlifV3Theme;
-                    case ThemeHelper.THEME_GLIF_V2_LIGHT:
-                        return R.style.GlifV2Theme_Light;
-                    case ThemeHelper.THEME_GLIF_V2:
-                        return R.style.GlifV2Theme;
-                    case ThemeHelper.THEME_GLIF_LIGHT:
-                        return R.style.GlifTheme_Light;
-                    case ThemeHelper.THEME_GLIF:
-                        return R.style.GlifTheme;
+                if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
+                    switch (theme) {
+                        case ThemeHelper.THEME_GLIF_V3_LIGHT:
+                        case ThemeHelper.THEME_GLIF_V3:
+                            return R.style.GlifV3Theme_DayNight;
+                        case ThemeHelper.THEME_GLIF_V2_LIGHT:
+                        case ThemeHelper.THEME_GLIF_V2:
+                            return R.style.GlifV2Theme_DayNight;
+                        case ThemeHelper.THEME_GLIF_LIGHT:
+                        case ThemeHelper.THEME_GLIF:
+                            return R.style.GlifTheme_DayNight;
+                    }
+                } else {
+                    switch (theme) {
+                        case ThemeHelper.THEME_GLIF_V3_LIGHT:
+                            return R.style.GlifV3Theme_Light;
+                        case ThemeHelper.THEME_GLIF_V3:
+                            return R.style.GlifV3Theme;
+                        case ThemeHelper.THEME_GLIF_V2_LIGHT:
+                            return R.style.GlifV2Theme_Light;
+                        case ThemeHelper.THEME_GLIF_V2:
+                            return R.style.GlifV2Theme;
+                        case ThemeHelper.THEME_GLIF_LIGHT:
+                            return R.style.GlifTheme_Light;
+                        case ThemeHelper.THEME_GLIF:
+                            return R.style.GlifTheme;
+                    }
                 }
             } else {
                 switch (theme) {
@@ -76,17 +91,30 @@
         return R.style.GlifTheme;
     }
 
-    public static int getTransparentTheme(Intent intent) {
-        final int suwTheme = getTheme(intent);
-        int transparentTheme = R.style.GlifV2Theme_Light_Transparent;
-        if (suwTheme == R.style.GlifV3Theme) {
-            transparentTheme = R.style.GlifV3Theme_Transparent;
+    public static int getTransparentTheme(Context context, Intent intent) {
+        int transparentTheme;
+        final int suwTheme = getTheme(context, intent);
+        if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
+            transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
+        } else {
+            transparentTheme = R.style.GlifV2Theme_Light_Transparent;
+        }
+        if (suwTheme == R.style.GlifV3Theme_DayNight) {
+            transparentTheme = R.style.GlifV3Theme_DayNight_Transparent;
         } else if (suwTheme == R.style.GlifV3Theme_Light) {
             transparentTheme = R.style.GlifV3Theme_Light_Transparent;
-        } else if (suwTheme == R.style.GlifV2Theme) {
-            transparentTheme = R.style.GlifV2Theme_Transparent;
+        } else if (suwTheme == R.style.GlifV2Theme_DayNight) {
+            transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
+        } else if (suwTheme == R.style.GlifV2Theme_Light) {
+            transparentTheme = R.style.GlifV2Theme_Light_Transparent;
+        } else if (suwTheme == R.style.GlifTheme_DayNight) {
+            transparentTheme = R.style.SetupWizardTheme_DayNight_Transparent;
         } else if (suwTheme == R.style.GlifTheme_Light) {
             transparentTheme = R.style.SetupWizardTheme_Light_Transparent;
+        } else if (suwTheme == R.style.GlifV3Theme) {
+            transparentTheme = R.style.GlifV3Theme_Transparent;
+        } else if (suwTheme == R.style.GlifV2Theme) {
+            transparentTheme = R.style.GlifV2Theme_Transparent;
         } else if (suwTheme == R.style.GlifTheme) {
             transparentTheme = R.style.SetupWizardTheme_Transparent;
         }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 1a6c8e8..2b9ca48 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -17,6 +17,7 @@
 package com.android.settings.accessibility;
 
 import android.content.ComponentName;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -122,4 +123,11 @@
             finish();
         }
     }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        theme.applyStyle(R.style.SetupWizardPartnerResource, true);
+        super.onApplyThemeResource(theme, new_resid, first);
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index c0de313..04491cc 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -313,12 +313,6 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
-        mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? retrieveUserShortcutType(getPrefContext(), mComponentName.flattenToString(),
-                UserShortcutType.SOFTWARE)
-                : UserShortcutType.EMPTY;
-
         final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()
                 || mToggleServiceDividerSwitchPreference.isChecked();
         showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 678ef13..0f4b762 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -16,11 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
-import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
-import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
-import static com.android.settings.accessibility.PreferredShortcuts.saveUserShortcutType;
-
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
@@ -92,8 +87,7 @@
     protected static final String KEY_GENERAL_CATEGORY = "general_categories";
     protected static final String KEY_INTRODUCTION_CATEGORY = "introduction_categories";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
-    @VisibleForTesting
-    static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+    protected static final String KEY_SAVED_USER_SHORTCUT_TYPE = "shortcut_type";
 
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
     private SettingsContentObserver mSettingsContentObserver;
@@ -101,9 +95,9 @@
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
 
-    // Used to restore the edit dialog status.
-    protected int mUserShortcutTypesCache = UserShortcutType.EMPTY;
-    protected int mUserShortcutTypes = UserShortcutType.EMPTY;
+    public static final int NOT_SET = -1;
+    // Save user's shortcutType value when savedInstance has value (e.g. device rotated).
+    protected int mSavedCheckBoxValue = NOT_SET;
 
     // For html description of accessibility service, must follow the rule, such as
     // <img src="R.drawable.fileName"/>, a11y settings will get the resources successfully.
@@ -125,10 +119,11 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         // Restore the user shortcut type.
-        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
-            mUserShortcutTypesCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
-                    UserShortcutType.EMPTY);
+        if (savedInstanceState != null && savedInstanceState.containsKey(
+                KEY_SAVED_USER_SHORTCUT_TYPE)) {
+            mSavedCheckBoxValue = savedInstanceState.getInt(KEY_SAVED_USER_SHORTCUT_TYPE, NOT_SET);
         }
 
         setupDefaultShortcutIfNecessary(getPrefContext());
@@ -188,6 +183,7 @@
     @Override
     public void onResume() {
         super.onResume();
+
         final AccessibilityManager am = getPrefContext().getSystemService(
                 AccessibilityManager.class);
         am.addTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
@@ -207,7 +203,10 @@
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
+        final int value = getShortcutTypeCheckBoxValue();
+        if (value != NOT_SET) {
+            outState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE, value);
+        }
         super.onSaveInstanceState(outState);
     }
 
@@ -220,7 +219,7 @@
                         R.string.accessibility_shortcut_title, mPackageName);
                 dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
                         getPrefContext(), dialogTitle, this::callOnAlertDialogCheckboxClicked);
-                initializeDialogCheckBox(dialog);
+                setupEditShortcutDialog(dialog);
                 return dialog;
             case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
                 dialog = AccessibilityGestureNavigationTutorial
@@ -379,8 +378,8 @@
         mImageGetterCacheView.setImageURI(null);
         final int imageWidth = drawable.getIntrinsicWidth();
         final int imageHeight = drawable.getIntrinsicHeight();
-        final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
-        if ((imageWidth > getScreenWidthPixels(getPrefContext()))
+        final int screenHalfHeight = AccessibilityUtil.getScreenHeightPixels(getPrefContext()) / 2;
+        if ((imageWidth > AccessibilityUtil.getScreenWidthPixels(getPrefContext()))
                 || (imageHeight > screenHalfHeight)) {
             return null;
         }
@@ -396,7 +395,7 @@
             return;
         }
 
-        final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
+        final int screenHalfHeight = AccessibilityUtil.getScreenHeightPixels(getPrefContext()) / 2;
         final AnimatedImagePreference animatedImagePreference =
                 new AnimatedImagePreference(getPrefContext());
         animatedImagePreference.setImageUri(mImageUri);
@@ -425,6 +424,20 @@
         getPreferenceScreen().addPreference(generalCategory);
     }
 
+    protected void initShortcutPreference() {
+        // Initial the shortcut preference.
+        mShortcutPreference = new ShortcutPreference(getPrefContext(), /* attrs= */ null);
+        mShortcutPreference.setPersistent(false);
+        mShortcutPreference.setKey(getShortcutPreferenceKey());
+        mShortcutPreference.setOnClickCallback(this);
+
+        final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
+        mShortcutPreference.setTitle(title);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mShortcutPreference);
+    }
+
     protected void initSettingsPreference() {
         if (mSettingsTitle == null || mSettingsIntent == null) {
             return;
@@ -478,16 +491,8 @@
         }
     }
 
-    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
-        final View dialogTextArea = dialogView.findViewById(R.id.container);
-        dialogTextArea.setOnClickListener(v -> {
-            checkBox.toggle();
-            updateUserShortcutType(/* saveChanges= */ false);
-        });
-    }
-
     @VisibleForTesting
-    void initializeDialogCheckBox(Dialog dialog) {
+    void setupEditShortcutDialog(Dialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -496,39 +501,58 @@
         mHardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogHardwareView, mHardwareTypeCheckBox);
 
-        updateAlertDialogCheckState();
+        updateEditShortcutDialogCheckBox();
     }
 
-    private void updateAlertDialogCheckState() {
-        if (mUserShortcutTypesCache != UserShortcutType.EMPTY) {
-            updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
-            updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
+    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
+        final View dialogTextArea = dialogView.findViewById(R.id.container);
+        dialogTextArea.setOnClickListener(v -> checkBox.toggle());
+    }
+
+    private void updateEditShortcutDialogCheckBox() {
+        // If it is during onConfigChanged process then restore the value, or get the saved value
+        // when shortcutPreference is checked.
+        int value = restoreOnConfigChangedValue();
+        if (value == NOT_SET) {
+            final int lastNonEmptyUserShortcutType = PreferredShortcuts.retrieveUserShortcutType(
+                    getPrefContext(), mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+            value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
+                    : UserShortcutType.EMPTY;
         }
+
+        mSoftwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.SOFTWARE));
+        mHardwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.HARDWARE));
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
-        checkBox.setChecked((mUserShortcutTypesCache & type) == type);
+    private int restoreOnConfigChangedValue() {
+        final int savedValue = mSavedCheckBoxValue;
+        mSavedCheckBoxValue = NOT_SET;
+        return savedValue;
     }
 
-    @VisibleForTesting
-    void updateUserShortcutType(boolean saveChanges) {
-        mUserShortcutTypesCache = UserShortcutType.EMPTY;
+    private boolean hasShortcutType(int value, @UserShortcutType int type) {
+        return (value & type) == type;
+    }
+
+    /**
+     * Returns accumulated {@link UserShortcutType} checkbox value or {@code NOT_SET} if checkboxes
+     * did not exist.
+     */
+    protected int getShortcutTypeCheckBoxValue() {
+        if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
+            return NOT_SET;
+        }
+
+        int value = UserShortcutType.EMPTY;
         if (mSoftwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
+            value |= UserShortcutType.SOFTWARE;
         }
         if (mHardwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.HARDWARE;
+            value |= UserShortcutType.HARDWARE;
         }
-
-        if (saveChanges) {
-            final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
-            if (isChanged) {
-                final PreferredShortcut shortcut = new PreferredShortcut(
-                        mComponentName.flattenToString(), mUserShortcutTypesCache);
-                saveUserShortcutType(getPrefContext(), shortcut);
-            }
-            mUserShortcutTypes = mUserShortcutTypesCache;
-        }
+        return value;
     }
 
     protected CharSequence getShortcutTypeSummary(Context context) {
@@ -540,7 +564,7 @@
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutTypes = retrieveUserShortcutType(context,
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
                 mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         int resId = R.string.accessibility_shortcut_edit_summary_software;
         if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
@@ -581,14 +605,13 @@
             return;
         }
 
-        updateUserShortcutType(/* saveChanges= */ true);
-        AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), mUserShortcutTypes,
-                mComponentName);
-        AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~mUserShortcutTypes,
-                mComponentName);
-        mShortcutPreference.setChecked(mUserShortcutTypes != UserShortcutType.EMPTY);
-        mShortcutPreference.setSummary(
-                getShortcutTypeSummary(getPrefContext()));
+        final int value = getShortcutTypeCheckBoxValue();
+
+        saveNonEmptyUserShortcutType(value);
+        AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), value, mComponentName);
+        AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~value, mComponentName);
+        mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
+        mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
 
     protected void updateShortcutPreferenceData() {
@@ -596,40 +619,21 @@
             return;
         }
 
-        // Get the user shortcut type from settings provider.
-        mUserShortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
-                mComponentName);
-        if (mUserShortcutTypes != UserShortcutType.EMPTY) {
+        final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(
+                getPrefContext(), mComponentName);
+        if (shortcutTypes != UserShortcutType.EMPTY) {
             final PreferredShortcut shortcut = new PreferredShortcut(
-                    mComponentName.flattenToString(), mUserShortcutTypes);
-            saveUserShortcutType(getPrefContext(), shortcut);
-        } else {
-            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
-            mUserShortcutTypes = retrieveUserShortcutType(getPrefContext(),
-                    mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+                    mComponentName.flattenToString(), shortcutTypes);
+            PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
         }
     }
 
-    protected void initShortcutPreference() {
-        // Initial the shortcut preference.
-        mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
-        mShortcutPreference.setPersistent(false);
-        mShortcutPreference.setKey(getShortcutPreferenceKey());
-        mShortcutPreference.setOnClickCallback(this);
-
-        final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
-        mShortcutPreference.setTitle(title);
-
-        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
-        generalCategory.addPreference(mShortcutPreference);
-    }
-
     protected void updateShortcutPreference() {
         if (mComponentName == null) {
             return;
         }
 
-        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
                 mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         mShortcutPreference.setChecked(
                 AccessibilityUtil.hasValuesInSettings(getPrefContext(), shortcutTypes,
@@ -647,7 +651,7 @@
             return;
         }
 
-        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
                 mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,
@@ -662,11 +666,6 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
-        mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? retrieveUserShortcutType(getPrefContext(),
-                mComponentName.flattenToString(), UserShortcutType.SOFTWARE)
-                : UserShortcutType.EMPTY;
         showDialog(DialogEnums.EDIT_SHORTCUT);
     }
 
@@ -703,4 +702,15 @@
                     shortcutName.flattenToString());
         }
     }
+
+    @VisibleForTesting
+    void saveNonEmptyUserShortcutType(int type) {
+        if (type == UserShortcutType.EMPTY) {
+            return;
+        }
+
+        final PreferredShortcut shortcut = new PreferredShortcut(
+                mComponentName.flattenToString(), type);
+        PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index d470bef..8e14e5a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -19,8 +19,6 @@
 import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
-import static com.android.settings.accessibility.PreferredShortcuts.saveUserShortcutType;
 
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
@@ -58,17 +56,13 @@
  */
 public class ToggleScreenMagnificationPreferenceFragment extends
         ToggleFeaturePreferenceFragment {
-
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+    // TODO(b/147021230): Move duplicated functions with android/internal/accessibility into util.
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
 
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
     private CheckBox mTripleTapTypeCheckBox;
 
-    // TODO(b/147021230): Will move common functions and variables to
-    //  android/internal/accessibility folder. For now, magnification need to be treated
-    //  individually.
     private static final char COMPONENT_NAME_SEPARATOR = ':';
     private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
             new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
@@ -95,12 +89,6 @@
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
@@ -131,21 +119,13 @@
                 dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
                                 getPrefContext(), dialogTitle,
                                 this::callOnAlertDialogCheckboxClicked);
-                initializeDialogCheckBox(dialog);
+                setupMagnificationEditShortcutDialog(dialog);
                 return dialog;
             default:
                 return super.onCreateDialog(dialogId);
         }
     }
 
-    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
-        final View dialogTextArea = dialogView.findViewById(R.id.container);
-        dialogTextArea.setOnClickListener(v -> {
-            checkBox.toggle();
-            updateUserShortcutType(/* saveChanges= */ false);
-        });
-    }
-
     @Override
     protected void initSettingsPreference() {
         mSettingsPreference = new Preference(getPrefContext());
@@ -157,8 +137,27 @@
         generalCategory.addPreference(mSettingsPreference);
     }
 
+    @Override
+    protected int getShortcutTypeCheckBoxValue() {
+        if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
+            return NOT_SET;
+        }
+
+        int value = UserShortcutType.EMPTY;
+        if (mSoftwareTypeCheckBox.isChecked()) {
+            value |= UserShortcutType.SOFTWARE;
+        }
+        if (mHardwareTypeCheckBox.isChecked()) {
+            value |= UserShortcutType.HARDWARE;
+        }
+        if (mTripleTapTypeCheckBox.isChecked()) {
+            value |= UserShortcutType.TRIPLETAP;
+        }
+        return value;
+    }
+
     @VisibleForTesting
-    void initializeDialogCheckBox(AlertDialog dialog) {
+    void setupMagnificationEditShortcutDialog(AlertDialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -172,49 +171,46 @@
         setDialogTextAreaClickListener(dialogTripleTapView, mTripleTapTypeCheckBox);
 
         final View advancedView = dialog.findViewById(R.id.advanced_shortcut);
-        updateAlertDialogCheckState();
-
-        // Shows the triple tap checkbox directly if clicked.
         if (mTripleTapTypeCheckBox.isChecked()) {
             advancedView.setVisibility(View.GONE);
             dialogTripleTapView.setVisibility(View.VISIBLE);
         }
+
+        updateMagnificationEditShortcutDialogCheckBox();
     }
 
-    private void updateAlertDialogCheckState() {
-        if (mUserShortcutTypesCache != UserShortcutType.EMPTY) {
-            updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
-            updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
-            updateCheckStatus(mTripleTapTypeCheckBox, UserShortcutType.TRIPLETAP);
-        }
+    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
+        final View dialogTextArea = dialogView.findViewById(R.id.container);
+        dialogTextArea.setOnClickListener(v -> checkBox.toggle());
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
-        checkBox.setChecked((mUserShortcutTypesCache & type) == type);
+    private void updateMagnificationEditShortcutDialogCheckBox() {
+        // If it is during onConfigChanged process then restore the value, or get the saved value
+        // when shortcutPreference is checked.
+        int value = restoreOnConfigChangedValue();
+        if (value == NOT_SET) {
+            final int lastNonEmptyUserShortcutType = PreferredShortcuts.retrieveUserShortcutType(
+                    getPrefContext(), MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+            value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
+                    : UserShortcutType.EMPTY;
+        }
+
+        mSoftwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.SOFTWARE));
+        mHardwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.HARDWARE));
+        mTripleTapTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.TRIPLETAP));
     }
 
-    @VisibleForTesting
-    void updateUserShortcutType(boolean saveChanges) {
-        mUserShortcutTypesCache = UserShortcutType.EMPTY;
-        if (mSoftwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
-        }
-        if (mHardwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.HARDWARE;
-        }
-        if (mTripleTapTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.TRIPLETAP;
-        }
+    private int restoreOnConfigChangedValue() {
+        final int savedValue = mSavedCheckBoxValue;
+        mSavedCheckBoxValue = NOT_SET;
+        return savedValue;
+    }
 
-        if (saveChanges) {
-            final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
-            if (isChanged) {
-                final PreferredShortcut shortcut = new PreferredShortcut(
-                        MAGNIFICATION_CONTROLLER_NAME, mUserShortcutTypesCache);
-                saveUserShortcutType(getPrefContext(), shortcut);
-            }
-            mUserShortcutTypes = mUserShortcutTypesCache;
-        }
+    private boolean hasShortcutType(int value, @UserShortcutType int type) {
+        return (value & type) == type;
     }
 
     @Override
@@ -223,8 +219,8 @@
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutType = retrieveUserShortcutType(context, MAGNIFICATION_CONTROLLER_NAME,
-                UserShortcutType.EMPTY);
+        final int shortcutType = PreferredShortcuts.retrieveUserShortcutType(context,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         int resId = R.string.accessibility_shortcut_edit_summary_software;
         if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
             resId = AccessibilityUtil.isTouchExploreEnabled(context)
@@ -261,10 +257,12 @@
 
     @Override
     protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
-        updateUserShortcutType(/* saveChanges= */ true);
-        optInAllMagnificationValuesToSettings(getPrefContext(), mUserShortcutTypes);
-        optOutAllMagnificationValuesFromSettings(getPrefContext(), ~mUserShortcutTypes);
-        mShortcutPreference.setChecked(mUserShortcutTypes != UserShortcutType.EMPTY);
+        final int value = getShortcutTypeCheckBoxValue();
+
+        saveNonEmptyUserShortcutType(value);
+        optInAllMagnificationValuesToSettings(getPrefContext(), value);
+        optOutAllMagnificationValuesFromSettings(getPrefContext(), ~value);
+        mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
@@ -312,7 +310,7 @@
 
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
-        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
                 MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             optInAllMagnificationValuesToSettings(getPrefContext(), shortcutTypes);
@@ -325,26 +323,16 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
-        mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? retrieveUserShortcutType(getPrefContext(),
-                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE)
-                : UserShortcutType.EMPTY;
         showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);
     }
 
     @Override
     protected void updateShortcutPreferenceData() {
-        // Get the user shortcut type from settings provider.
-        mUserShortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
-        if (mUserShortcutTypes != UserShortcutType.EMPTY) {
+        final int shortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
+        if (shortcutTypes != UserShortcutType.EMPTY) {
             final PreferredShortcut shortcut = new PreferredShortcut(
-                    MAGNIFICATION_CONTROLLER_NAME, mUserShortcutTypes);
-            saveUserShortcutType(getPrefContext(), shortcut);
-        } else {
-            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
-            mUserShortcutTypes = retrieveUserShortcutType(getPrefContext(),
-                    MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+                    MAGNIFICATION_CONTROLLER_NAME, shortcutTypes);
+            PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
         }
     }
 
@@ -365,7 +353,7 @@
 
     @Override
     protected void updateShortcutPreference() {
-        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
                 MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         mShortcutPreference.setChecked(
                 hasMagnificationValuesInSettings(getPrefContext(), shortcutTypes));
@@ -373,6 +361,17 @@
     }
 
     @VisibleForTesting
+    void saveNonEmptyUserShortcutType(int type) {
+        if (type == UserShortcutType.EMPTY) {
+            return;
+        }
+
+        final PreferredShortcut shortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME, type);
+        PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
+    }
+
+    @VisibleForTesting
     static void optInAllMagnificationValuesToSettings(Context context, int shortcutTypes) {
         if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             optInMagnificationValueToSettings(context, UserShortcutType.SOFTWARE);
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 791efa7..4822607 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -203,9 +203,9 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
         theme.applyStyle(R.style.SetupWizardPartnerResource, true);
-        super.onApplyThemeResource(theme, resid, first);
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 1d9d07b..7936f66 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -116,9 +116,9 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
         theme.applyStyle(R.style.SetupWizardPartnerResource, true);
-        super.onApplyThemeResource(theme, resid, first);
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
index 10d5ca8..c411b0c 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -127,10 +127,12 @@
         PendingIntent pairIntent = PendingIntent.getActivity(this, 0,
                 getPairingDialogIntent(this, intent,
                         BluetoothDevice.EXTRA_PAIRING_INITIATOR_BACKGROUND),
-                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT
+                        | PendingIntent.FLAG_IMMUTABLE);
 
         PendingIntent dismissIntent = PendingIntent.getBroadcast(this, 0,
-                new Intent(ACTION_DISMISS_PAIRING), PendingIntent.FLAG_ONE_SHOT);
+                new Intent(ACTION_DISMISS_PAIRING), PendingIntent.FLAG_ONE_SHOT
+                        | PendingIntent.FLAG_IMMUTABLE);
 
         mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index c5f62b8..ae3b08a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -177,8 +177,9 @@
                         .setOnlyAlertOnce(false)
                         .setDefaults(Notification.DEFAULT_ALL)
                         .setContentIntent(PendingIntent.getActivity(context, 0,
-                                connectionAccessIntent, 0))
-                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
+                                connectionAccessIntent, PendingIntent.FLAG_IMMUTABLE))
+                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent,
+                                PendingIntent.FLAG_IMMUTABLE))
                         .setColor(context.getColor(
                                 com.android.internal.R.color.system_notification_accent_color))
                         .setLocalOnly(true)
diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
index a6170d8..f11b0e3 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
@@ -43,6 +43,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+// TODO(b/172310863): consider removing this slice.
 public class ContextualAdaptiveSleepSlice implements CustomSliceable {
     private static final String TAG = "ContextualAdaptiveSleepSlice";
     private static final long DEFAULT_SETUP_TIME = 0;
@@ -122,7 +123,8 @@
 
     private PendingIntent getPrimaryAction() {
         final Intent intent = getIntent();
-        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent, 0  /* flags */);
+        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE  /* flags */);
     }
 
     /**
diff --git a/src/com/android/settings/media/MediaOutputGroupSlice.java b/src/com/android/settings/media/MediaOutputGroupSlice.java
index d33ca45..0359ca9 100644
--- a/src/com/android/settings/media/MediaOutputGroupSlice.java
+++ b/src/com/android/settings/media/MediaOutputGroupSlice.java
@@ -194,7 +194,7 @@
         intent.putExtra(CUSTOMIZED_ACTION, action);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         return PendingIntent.getBroadcast(mContext, requestCode, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     private MediaDeviceUpdateWorker getWorker() {
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 6611e8d..8b3c1ec 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -147,7 +147,8 @@
                 .setSourceMetricsCategory(SettingsEnums.PANEL_MEDIA_OUTPUT)
                 .toIntent();
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */),
+                PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,
+                        PendingIntent.FLAG_IMMUTABLE),
                 IconCompat.createWithResource(mContext, R.drawable.ic_add_24dp/*ic_add_blue_24dp*/),
                 ListBuilder.ICON_IMAGE,
                 mContext.getText(R.string.bluetooth_pairing_pref_title));
@@ -248,7 +249,8 @@
                 .putExtra(MEDIA_DEVICE_ID, id)
                 .setClass(mContext, SliceBroadcastReceiver.class);
 
-        return PendingIntent.getBroadcast(mContext, requestCode, intent, 0);
+        return PendingIntent.getBroadcast(mContext, requestCode, intent,
+                PendingIntent.FLAG_IMMUTABLE);
     }
 
     private SliceAction getEndItemSliceAction() {
@@ -261,7 +263,8 @@
                 ? 0
                 : getWorker().getPackageName().hashCode();
         return SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, requestCode, intent, 0 /* flags */),
+                PendingIntent.getActivity(mContext, requestCode, intent,
+                        PendingIntent.FLAG_IMMUTABLE),
                 IconCompat.createWithResource(mContext, R.drawable.ic_add_blue_24dp),
                 ListBuilder.ICON_IMAGE,
                 mContext.getText(R.string.add));
@@ -350,7 +353,7 @@
         intent.putExtra(MEDIA_DEVICE_ID, id);
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         return PendingIntent.getBroadcast(context, requestCode, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     @Override
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index debc0ec..839dc4f 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -165,7 +165,8 @@
                 .setData(getUri())
                 .putExtra(MEDIA_ID, id)
                 .setClass(mContext, SliceBroadcastReceiver.class);
-        return PendingIntent.getBroadcast(mContext, requestCode, intent, 0);
+        return PendingIntent.getBroadcast(mContext, requestCode, intent,
+                PendingIntent.FLAG_MUTABLE);
     }
 
     private SliceAction getSoundSettingAction(CharSequence actionTitle, IconCompat icon,
@@ -177,7 +178,8 @@
                 mContext.getText(R.string.sound_settings).toString(), 0);
         intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
         intent.setData(contentUri);
-        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
+                PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(pendingIntent, icon,
                 ListBuilder.ICON_IMAGE, actionTitle);
         return primarySliceAction;
@@ -192,7 +194,8 @@
                 .putExtra(SESSION_INFO, info)
                 .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
-                info.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                info.hashCode(), intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
                 primaryBroadcastIntent,
                 IconCompat.createWithResource(mContext, R.drawable.ic_volume_remote),
diff --git a/src/com/android/settings/network/CarrierConfigChangedReceiver.java b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
new file mode 100644
index 0000000..8a6d47d
--- /dev/null
+++ b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
@@ -0,0 +1,62 @@
+/*
+ * 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.network;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telephony.CarrierConfigManager;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+
+/** A receiver listens to the carrier config changes. */
+public class CarrierConfigChangedReceiver extends BroadcastReceiver {
+    private static final String TAG = "CarrierConfigChangedReceiver";
+    private static final String ACTION_CARRIER_CONFIG_CHANGED =
+            CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED;
+
+    private final CountDownLatch mLatch;
+
+    public CarrierConfigChangedReceiver(CountDownLatch latch) {
+        mLatch = latch;
+    }
+
+    public void registerOn(Context context) {
+        context.registerReceiver(this, new IntentFilter(ACTION_CARRIER_CONFIG_CHANGED));
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (isInitialStickyBroadcast()) {
+            return;
+        }
+
+        if (ACTION_CARRIER_CONFIG_CHANGED.equals(intent.getAction())) {
+            checkSubscriptionIndex(intent);
+        }
+    }
+
+    private void checkSubscriptionIndex(Intent intent) {
+        if (intent.hasExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX)) {
+            int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX, -1);
+            Log.i(TAG, "subId from config changed: " + subId);
+            mLatch.countDown();
+        }
+    }
+}
diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
new file mode 100644
index 0000000..c47e61a
--- /dev/null
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -0,0 +1,190 @@
+/*
+ * 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.network;
+
+import android.app.FragmentManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.settings.AsyncTaskSidecar;
+import com.android.settings.SidecarFragment;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * {@code EnableMultiSimSidecar} enables multi SIM on the device. It should only be called for
+ * Android R+. After {@code run} is called, it sets the configuration on modem side to enable
+ * multiple SIMs. Once the configuration is set successfully, it will listen to UICC card changes
+ * until {@code TelMan.EXTRA_ACTIVE_SIM_SUPPORTED_COUNT} matches {@code mNumOfActiveSim} or timeout.
+ */
+public class EnableMultiSimSidecar extends AsyncTaskSidecar<Void, Boolean> {
+
+    // Tags
+    private static final String TAG = "EnableMultiSimSidecar";
+
+    // TODO(b/171846124): Pass timeout value from LPA to Settings
+    private static final long ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
+
+    public static EnableMultiSimSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, EnableMultiSimSidecar.class, null /* args */);
+    }
+
+    final CountDownLatch mSimCardStateChangedLatch = new CountDownLatch(1);
+    private TelephonyManager mTelephonyManager;
+    private int mNumOfActiveSim = 0;
+
+    private final BroadcastReceiver mCarrierConfigChangeReceiver =
+            new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    int readySimsCount = getReadySimsCount();
+                    int activeSlotsCount = getActiveSlotsCount();
+                    // If the number of ready SIM count and active slots equal to the number of SIMs
+                    // need to be activated, the device is successfully switched to multiple active
+                    // SIM mode.
+                    if (readySimsCount == mNumOfActiveSim && activeSlotsCount == mNumOfActiveSim) {
+                        Log.i(
+                                TAG,
+                                String.format("%d slots are active and ready.", mNumOfActiveSim));
+                        mSimCardStateChangedLatch.countDown();
+                        return;
+                    }
+                    Log.i(
+                            TAG,
+                            String.format(
+                                    "%d slots are active and %d SIMs are ready. Keep waiting until"
+                                        + " timeout.",
+                                    activeSlotsCount, readySimsCount));
+                }
+            };
+
+    @Override
+    protected Boolean doInBackground(Void aVoid) {
+        return updateMultiSimConfig();
+    }
+
+    @Override
+    protected void onPostExecute(Boolean isDsdsEnabled) {
+        if (isDsdsEnabled) {
+            setState(State.SUCCESS, Substate.UNUSED);
+        } else {
+            setState(State.ERROR, Substate.UNUSED);
+        }
+    }
+
+    public void run(int numberOfSimToActivate) {
+        mTelephonyManager = getContext().getSystemService(TelephonyManager.class);
+        mNumOfActiveSim = numberOfSimToActivate;
+
+        if (mNumOfActiveSim > mTelephonyManager.getSupportedModemCount()) {
+            Log.e(TAG, "Requested number of active SIM is greater than supported modem count.");
+            setState(State.ERROR, Substate.UNUSED);
+            return;
+        }
+        if (mTelephonyManager.doesSwitchMultiSimConfigTriggerReboot()) {
+            Log.e(TAG, "The device does not support reboot free DSDS.");
+            setState(State.ERROR, Substate.UNUSED);
+            return;
+        }
+        super.run(null /* param */);
+    }
+
+    // This method registers a ACTION_SIM_CARD_STATE_CHANGED broadcast receiver and wait for slot
+    // changes. If multi SIMs have been successfully enabled, it returns true. Otherwise, returns
+    // false.
+    private boolean updateMultiSimConfig() {
+        try {
+            getContext()
+                    .registerReceiver(
+                            mCarrierConfigChangeReceiver,
+                            new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
+            mTelephonyManager.switchMultiSimConfig(mNumOfActiveSim);
+            if (mSimCardStateChangedLatch.await(
+                    ENABLE_MULTI_SIM_TIMEOUT_MILLS, TimeUnit.MILLISECONDS)) {
+                Log.i(TAG, "Multi SIM were successfully enabled.");
+                return true;
+            } else {
+                Log.e(TAG, "Timeout for waiting SIM status.");
+                return false;
+            }
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Failed to enable multiple SIM due to InterruptedException", e);
+            return false;
+        } finally {
+            getContext().unregisterReceiver(mCarrierConfigChangeReceiver);
+        }
+    }
+
+    // Returns how many SIMs have SIM ready state, not ready state, or removable slot with absent
+    // SIM state.
+    private int getReadySimsCount() {
+        int readyCardsCount = 0;
+        int activeSlotCount = mTelephonyManager.getActiveModemCount();
+        Set<Integer> activeRemovableLogicalSlots = getActiveRemovableLogicalSlotIds();
+        for (int logicalSlotId = 0; logicalSlotId < activeSlotCount; logicalSlotId++) {
+            int simState = mTelephonyManager.getSimState(logicalSlotId);
+            if (simState == TelephonyManager.SIM_STATE_READY
+                    || simState == TelephonyManager.SIM_STATE_NOT_READY
+                    || simState == TelephonyManager.SIM_STATE_LOADED
+                    || (simState == TelephonyManager.SIM_STATE_ABSENT
+                            && activeRemovableLogicalSlots.contains(logicalSlotId))) {
+                readyCardsCount++;
+            }
+        }
+        return readyCardsCount;
+    }
+
+    // Get active slots count from {@code TelephonyManager#getUiccSlotsInfo}.
+    private int getActiveSlotsCount() {
+        UiccSlotInfo[] slotsInfo = mTelephonyManager.getUiccSlotsInfo();
+        if (slotsInfo == null) {
+            return 0;
+        }
+        int activeSlots = 0;
+        for (UiccSlotInfo slotInfo : slotsInfo) {
+            if (slotInfo != null && slotInfo.getIsActive()) {
+                activeSlots++;
+            }
+        }
+        return activeSlots;
+    }
+
+    /** Returns a list of active removable logical slot ids. */
+    public Set<Integer> getActiveRemovableLogicalSlotIds() {
+        UiccSlotInfo[] infos = mTelephonyManager.getUiccSlotsInfo();
+        if (infos == null) {
+            return Collections.emptySet();
+        }
+        Set<Integer> activeRemovableLogicalSlotIds = new ArraySet<>();
+        for (UiccSlotInfo info : infos) {
+            if (info != null && info.getIsActive() && info.isRemovable()) {
+                activeRemovableLogicalSlotIds.add(info.getLogicalSlotIdx());
+            }
+        }
+        return activeRemovableLogicalSlotIds;
+    }
+}
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 76d60e5..ad901ee 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -21,6 +21,7 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 
 import androidx.appcompat.app.AlertDialog;
@@ -57,14 +58,20 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.network_and_internet;
+        if (isProviderModelEnabled(getContext())) {
+            return R.xml.network_provider_internet;
+        } else {
+            return R.xml.network_and_internet;
+        }
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
 
-        use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
+        if (!isProviderModelEnabled(context)) {
+            use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
+        }
         use(AirplaneModePreferenceController.class).setFragment(this);
         getSettingsLifecycle().addObserver(use(AllInOneTetherPreferenceController.class));
     }
@@ -164,4 +171,8 @@
                             null /* mobilePlanHost */);
                 }
             };
+
+    private static boolean isProviderModelEnabled(Context context) {
+        return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
+    }
 }
diff --git a/src/com/android/settings/network/SwitchSlotSidecar.java b/src/com/android/settings/network/SwitchSlotSidecar.java
new file mode 100644
index 0000000..cffb23f
--- /dev/null
+++ b/src/com/android/settings/network/SwitchSlotSidecar.java
@@ -0,0 +1,115 @@
+/*
+ * 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.network;
+
+import android.annotation.IntDef;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.AsyncTaskSidecar;
+import com.android.settings.SidecarFragment;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.Nullable;
+
+/** {@link SidecarFragment} to switch SIM slot. */
+public class SwitchSlotSidecar
+        extends AsyncTaskSidecar<SwitchSlotSidecar.Param, SwitchSlotSidecar.Result> {
+    private static final String TAG = "SwitchSlotSidecar";
+
+    /** Commands */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+        Command.SWITCH_TO_REMOVABLE_SIM,
+    })
+    private @interface Command {
+        int SWITCH_TO_REMOVABLE_SIM = 0;
+    }
+
+    static class Param {
+        @Command int command;
+        int slotId;
+    }
+
+    static class Result {
+        Exception exception;
+    }
+
+    /** Returns a SwitchSlotSidecar sidecar instance. */
+    public static SwitchSlotSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, SwitchSlotSidecar.class, null /* args */);
+    }
+
+    @Nullable private Exception mException;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    /** Starts switching to the removable slot. */
+    public void runSwitchToRemovableSlot(int id) {
+        Param param = new Param();
+        param.command = Command.SWITCH_TO_REMOVABLE_SIM;
+        param.slotId = id;
+        super.run(param);
+    }
+
+    /**
+     * Returns the exception thrown during the execution of a command. Will be null in any state
+     * other than {@link State#SUCCESS}, and may be null in that state if there was not an error.
+     */
+    @Nullable
+    public Exception getException() {
+        return mException;
+    }
+
+    @Override
+    protected Result doInBackground(@Nullable Param param) {
+        Result result = new Result();
+        if (param == null) {
+            result.exception = new UiccSlotsException("Null param");
+            return result;
+        }
+        try {
+            switch (param.command) {
+                case Command.SWITCH_TO_REMOVABLE_SIM:
+                    UiccSlotUtil.switchToRemovableSlot(param.slotId, getContext());
+                    break;
+                default:
+                    Log.e(TAG, "Wrong command.");
+                    break;
+            }
+        } catch (UiccSlotsException e) {
+            result.exception = e;
+        }
+        return result;
+    }
+
+    @Override
+    protected void onPostExecute(Result result) {
+        if (result.exception == null) {
+            setState(State.SUCCESS, Substate.UNUSED);
+        } else {
+            mException = result.exception;
+            setState(State.ERROR, Substate.UNUSED);
+        }
+    }
+}
diff --git a/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
new file mode 100644
index 0000000..132a2fd
--- /dev/null
+++ b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
@@ -0,0 +1,139 @@
+/*
+ * 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.network;
+
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.telephony.EuiccOperationSidecar;
+
+/**
+ * This sidecar is responsible for switching to the removable slot. It disables the active eSIM
+ * profile before switching if there is one.
+ */
+public class SwitchToRemovableSlotSidecar extends EuiccOperationSidecar
+        implements SidecarFragment.Listener {
+
+    private static final String TAG = "DisableSubscriptionAndSwitchSlotSidecar";
+    private static final String ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT =
+            "disable_subscription_and_switch_slot_sidecar";
+
+    // Stateless members.
+    private SwitchToEuiccSubscriptionSidecar mSwitchToSubscriptionSidecar;
+    private SwitchSlotSidecar mSwitchSlotSidecar;
+    private int mPhysicalSlotId;
+
+    /** Returns a SwitchToRemovableSlotSidecar sidecar instance. */
+    public static SwitchToRemovableSlotSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, SwitchToRemovableSlotSidecar.class, null /* args */);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSwitchToSubscriptionSidecar =
+                SwitchToEuiccSubscriptionSidecar.get(getChildFragmentManager());
+        mSwitchSlotSidecar = SwitchSlotSidecar.get(getChildFragmentManager());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSwitchToSubscriptionSidecar.addListener(this);
+        mSwitchSlotSidecar.addListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        mSwitchToSubscriptionSidecar.removeListener(this);
+        mSwitchSlotSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    protected String getReceiverAction() {
+        return ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT;
+    }
+
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mSwitchToSubscriptionSidecar) {
+            onSwitchToSubscriptionSidecarStateChange();
+        } else if (fragment == mSwitchSlotSidecar) {
+            onSwitchSlotSidecarStateChange();
+        } else {
+            Log.wtf(TAG, "Received state change from a sidecar not expected.");
+        }
+    }
+
+    /**
+     * Starts switching to the removable slot. It disables the active eSIM profile before switching
+     * if there is one.
+     *
+     * @param physicalSlotId removable physical SIM slot ID.
+     */
+    public void run(int physicalSlotId) {
+        mPhysicalSlotId = physicalSlotId;
+        SubscriptionManager subscriptionManager =
+                getContext().getSystemService(SubscriptionManager.class);
+        if (SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
+                .anyMatch(SubscriptionInfo::isEmbedded)) {
+            Log.i(TAG, "There is an active eSIM profile. Disable the profile first.");
+            // Use INVALID_SUBSCRIPTION_ID to disable the only active profile.
+            mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        } else {
+            Log.i(TAG, "There is no active eSIM profiles. Start to switch to removable slot.");
+            mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+        }
+    }
+
+    private void onSwitchToSubscriptionSidecarStateChange() {
+        switch (mSwitchToSubscriptionSidecar.getState()) {
+            case State.SUCCESS:
+                mSwitchToSubscriptionSidecar.reset();
+                Log.i(
+                        TAG,
+                        "Successfully disabled eSIM profile. Start to switch to Removable slot.");
+                mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+                break;
+            case State.ERROR:
+                mSwitchToSubscriptionSidecar.reset();
+                Log.i(TAG, "Failed to disable the active eSIM profile.");
+                setState(State.ERROR, Substate.UNUSED);
+                break;
+        }
+    }
+
+    private void onSwitchSlotSidecarStateChange() {
+        switch (mSwitchSlotSidecar.getState()) {
+            case State.SUCCESS:
+                mSwitchSlotSidecar.reset();
+                Log.i(TAG, "Successfully switched to removable slot.");
+                setState(State.SUCCESS, Substate.UNUSED);
+                break;
+            case State.ERROR:
+                mSwitchSlotSidecar.reset();
+                Log.i(TAG, "Failed to switch to removable slot.");
+                setState(State.ERROR, Substate.UNUSED);
+                break;
+        }
+    }
+}
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
new file mode 100644
index 0000000..792f02a
--- /dev/null
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -0,0 +1,153 @@
+/*
+ * 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.network;
+
+import android.annotation.IntDef;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.Log;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import com.google.common.collect.ImmutableList;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class UiccSlotUtil {
+
+    private static final String TAG = "UiccSlotUtil";
+
+    // TODO(b/171846124): Pass timeout value from LPA to Settings
+    private static final long WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25000;
+
+    public static final int INVALID_PHYSICAL_SLOT_ID = -1;
+
+    /**
+     * Mode for switching to eSIM slot which decides whether there is cleanup process, e.g.
+     * disabling test profile, after eSIM slot is activated and whether we will wait it finished.
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+        SwitchingEsimMode.NO_CLEANUP,
+        SwitchingEsimMode.ASYNC_CLEANUP,
+        SwitchingEsimMode.SYNC_CLEANUP
+    })
+    public @interface SwitchingEsimMode {
+        /** No cleanup process after switching to eSIM slot */
+        int NO_CLEANUP = 0;
+        /** Has cleanup process, but we will not wait it finished. */
+        int ASYNC_CLEANUP = 1;
+        /** Has cleanup process and we will wait until it's finished */
+        int SYNC_CLEANUP = 2;
+    }
+
+    /**
+     * Returns an immutable list of all UICC slots. If TelephonyManager#getUiccSlotsInfo returns, it
+     * returns an empty list instead.
+     */
+    public static ImmutableList<UiccSlotInfo> getSlotInfos(TelephonyManager telMgr) {
+        UiccSlotInfo[] slotInfos = telMgr.getUiccSlotsInfo();
+        if (slotInfos == null) {
+            return ImmutableList.of();
+        }
+        return ImmutableList.copyOf(slotInfos);
+    }
+
+    /**
+     * Switches to the removable slot. It waits for SIM_STATE_LOADED after switch. If slotId is
+     * INVALID_PHYSICAL_SLOT_ID, the method will use the first detected inactive removable slot.
+     *
+     * @param slotId the physical removable slot id.
+     * @param context the application context.
+     * @throws UiccSlotsException if there is an error.
+     */
+    public static synchronized void switchToRemovableSlot(int slotId, Context context)
+            throws UiccSlotsException {
+        if (ThreadUtils.isMainThread()) {
+            throw new IllegalThreadStateException(
+                    "Do not call switchToRemovableSlot on the main thread.");
+        }
+        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        if (telMgr.isMultiSimEnabled()) {
+            // If this device supports multiple active slots, don't mess with TelephonyManager.
+            Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
+            return;
+        }
+        UiccSlotInfo[] slots = telMgr.getUiccSlotsInfo();
+        if (slotId == INVALID_PHYSICAL_SLOT_ID) {
+            for (int i = 0; i < slots.length; i++) {
+                if (slots[i].isRemovable()
+                        && !slots[i].getIsActive()
+                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
+                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
+                    performSwitchToRemovableSlot(i, context);
+                    return;
+                }
+            }
+        } else {
+            if (slotId >= slots.length || !slots[slotId].isRemovable()) {
+                throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
+            }
+            if (!slots[slotId].getIsActive()) {
+                performSwitchToRemovableSlot(slotId, context);
+            }
+        }
+    }
+
+    private static void performSwitchToRemovableSlot(int slotId, Context context)
+            throws UiccSlotsException {
+        CarrierConfigChangedReceiver receiver = null;
+        try {
+            CountDownLatch latch = new CountDownLatch(1);
+            receiver = new CarrierConfigChangedReceiver(latch);
+            receiver.registerOn(context);
+            switchSlots(context, slotId);
+            latch.await(WAIT_AFTER_SWITCH_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            Log.e(TAG, "Failed switching to physical slot.", e);
+        } finally {
+            if (receiver != null) {
+                context.unregisterReceiver(receiver);
+            }
+        }
+    }
+
+    /**
+     * Changes the logical slot to physical slot mapping. OEM should override this to provide
+     * device-specific implementation if the device supports switching slots.
+     *
+     * @param context the application context.
+     * @param physicalSlots List of physical slot ids in the order of logical slots.
+     */
+    private static void switchSlots(Context context, int... physicalSlots)
+            throws UiccSlotsException {
+        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        if (telMgr.isMultiSimEnabled()) {
+            // If this device supports multiple active slots, don't mess with TelephonyManager.
+            Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
+            return;
+        }
+        if (!telMgr.switchSlots(physicalSlots)) {
+            throw new UiccSlotsException("Failed to switch slots");
+        }
+    }
+}
diff --git a/src/com/android/settings/network/UiccSlotsException.java b/src/com/android/settings/network/UiccSlotsException.java
new file mode 100644
index 0000000..2a2edc5
--- /dev/null
+++ b/src/com/android/settings/network/UiccSlotsException.java
@@ -0,0 +1,35 @@
+/*
+ * 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.network;
+
+/** The exception that is thrown when an error happens in a call to {@link UiccSlotUtil}. */
+public class UiccSlotsException extends Exception {
+
+    public UiccSlotsException() {}
+
+    public UiccSlotsException(String message) {
+        super(message);
+    }
+
+    public UiccSlotsException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UiccSlotsException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 905ead0..919415b 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -22,15 +22,22 @@
 import android.os.UserManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.appcompat.app.AlertDialog;
-
 import com.android.settings.R;
 import com.android.settings.SidecarFragment;
+import com.android.settings.network.EnableMultiSimSidecar;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
+import com.android.settings.network.SwitchToRemovableSlotSidecar;
+import com.android.settings.network.UiccSlotUtil;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
 
 /** This dialog activity handles both eSIM and pSIM subscriptions enabling and disabling. */
 public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogActivity
@@ -41,6 +48,11 @@
     private static final String ARG_enable = "enable";
     // Dialog tags
     private static final int DIALOG_TAG_DISABLE_SIM_CONFIRMATION = 1;
+    private static final int DIALOG_TAG_ENABLE_SIM_CONFIRMATION = 2;
+    private static final int DIALOG_TAG_ENABLE_DSDS_CONFIRMATION = 3;
+    private static final int DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION = 4;
+    // Number of SIMs for DSDS
+    private static final int NUM_OF_SIMS_FOR_DSDS = 2;
 
     /**
      * Returns an intent of ToggleSubscriptionDialogActivity.
@@ -58,8 +70,11 @@
 
     private SubscriptionInfo mSubInfo;
     private SwitchToEuiccSubscriptionSidecar mSwitchToEuiccSubscriptionSidecar;
-    private AlertDialog mToggleSimConfirmDialog;
+    private SwitchToRemovableSlotSidecar mSwitchToRemovableSlotSidecar;
+    private EnableMultiSimSidecar mEnableMultiSimSidecar;
     private boolean mEnable;
+    private boolean mIsEsimOperation;
+    private TelephonyManager mTelMgr;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -67,6 +82,7 @@
 
         Intent intent = getIntent();
         int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        mTelMgr = getSystemService(TelephonyManager.class);
 
         UserManager userManager = getSystemService(UserManager.class);
         if (!userManager.isAdminUser()) {
@@ -82,13 +98,16 @@
         }
 
         mSubInfo = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
+        mIsEsimOperation = mSubInfo != null && mSubInfo.isEmbedded();
         mSwitchToEuiccSubscriptionSidecar =
                 SwitchToEuiccSubscriptionSidecar.get(getFragmentManager());
+        mSwitchToRemovableSlotSidecar = SwitchToRemovableSlotSidecar.get(getFragmentManager());
+        mEnableMultiSimSidecar = EnableMultiSimSidecar.get(getFragmentManager());
         mEnable = intent.getBooleanExtra(ARG_enable, true);
 
         if (savedInstanceState == null) {
             if (mEnable) {
-                handleEnablingSubAction();
+                showEnableSubDialog();
             } else {
                 showDisableSimConfirmDialog();
             }
@@ -99,10 +118,14 @@
     protected void onResume() {
         super.onResume();
         mSwitchToEuiccSubscriptionSidecar.addListener(this);
+        mSwitchToRemovableSlotSidecar.addListener(this);
+        mEnableMultiSimSidecar.addListener(this);
     }
 
     @Override
     protected void onPause() {
+        mEnableMultiSimSidecar.removeListener(this);
+        mSwitchToRemovableSlotSidecar.removeListener(this);
         mSwitchToEuiccSubscriptionSidecar.removeListener(this);
         super.onPause();
     }
@@ -111,19 +134,25 @@
     public void onStateChange(SidecarFragment fragment) {
         if (fragment == mSwitchToEuiccSubscriptionSidecar) {
             handleSwitchToEuiccSubscriptionSidecarStateChange();
+        } else if (fragment == mSwitchToRemovableSlotSidecar) {
+            handleSwitchToRemovableSlotSidecarStateChange();
+        } else if (fragment == mEnableMultiSimSidecar) {
+            handleEnableMultiSimSidecarStateChange();
         }
     }
 
     @Override
     public void onConfirm(int tag, boolean confirmed) {
-        if (!confirmed) {
+        if (!confirmed
+                && tag != DIALOG_TAG_ENABLE_DSDS_CONFIRMATION
+                && tag != DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION) {
             finish();
             return;
         }
 
         switch (tag) {
             case DIALOG_TAG_DISABLE_SIM_CONFIRMATION:
-                if (mSubInfo.isEmbedded()) {
+                if (mIsEsimOperation) {
                     Log.i(TAG, "Disabling the eSIM profile.");
                     showProgressDialog(
                             getString(R.string.privileged_action_disable_sub_dialog_progress));
@@ -132,6 +161,51 @@
                     return;
                 }
                 Log.i(TAG, "Disabling the pSIM profile.");
+                handleTogglePsimAction();
+                break;
+            case DIALOG_TAG_ENABLE_DSDS_CONFIRMATION:
+                if (!confirmed) {
+                    Log.i(TAG, "User cancel the dialog to enable DSDS.");
+                    showEnableSimConfirmDialog();
+                    return;
+                }
+                if (mTelMgr.doesSwitchMultiSimConfigTriggerReboot()) {
+                    Log.i(TAG, "Device does not support reboot free DSDS.");
+                    showRebootConfirmDialog();
+                    return;
+                }
+                Log.i(
+                        TAG,
+                        "Enabling DSDS without rebooting. "
+                                + getString(R.string.sim_action_enabling_sim_without_carrier_name));
+                showProgressDialog(
+                        getString(R.string.sim_action_enabling_sim_without_carrier_name));
+                mEnableMultiSimSidecar.run(NUM_OF_SIMS_FOR_DSDS);
+                break;
+            case DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION:
+                if (!confirmed) {
+                    Log.i(TAG, "User cancel the dialog to reboot to enable DSDS.");
+                    showEnableSimConfirmDialog();
+                    return;
+                }
+                Log.i(TAG, "User confirmed reboot to enable DSDS.");
+                mTelMgr.switchMultiSimConfig(NUM_OF_SIMS_FOR_DSDS);
+                // TODO(b/170507290): Store a bit in preferences for displaying the notification
+                //  after the reboot.
+                break;
+            case DIALOG_TAG_ENABLE_SIM_CONFIRMATION:
+                Log.i(TAG, "User confirmed to enable the subscription.");
+                if (mIsEsimOperation) {
+                    showProgressDialog(
+                            getString(
+                                    R.string.sim_action_switch_sub_dialog_progress,
+                                    mSubInfo.getDisplayName()));
+                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+                    return;
+                }
+                showProgressDialog(
+                        getString(R.string.sim_action_enabling_sim_without_carrier_name));
+                mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID);
                 break;
             default:
                 Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
@@ -165,10 +239,105 @@
         }
     }
 
+    private void handleSwitchToRemovableSlotSidecarStateChange() {
+        switch (mSwitchToRemovableSlotSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                Log.i(TAG, "Successfully switched to removable slot.");
+                mSwitchToRemovableSlotSidecar.reset();
+                handleTogglePsimAction();
+                dismissProgressDialog();
+                finish();
+                break;
+            case SidecarFragment.State.ERROR:
+                Log.e(TAG, "Failed switching to removable slot.");
+                mSwitchToRemovableSlotSidecar.reset();
+                dismissProgressDialog();
+                showErrorDialog(
+                        getString(R.string.sim_action_enable_sim_fail_title),
+                        getString(R.string.sim_action_enable_sim_fail_text));
+                break;
+        }
+    }
+
+    private void handleEnableMultiSimSidecarStateChange() {
+        switch (mEnableMultiSimSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                mEnableMultiSimSidecar.reset();
+                Log.i(TAG, "Successfully switched to DSDS without reboot.");
+                handleEnableSubscriptionAfterEnablingDsds();
+                break;
+            case SidecarFragment.State.ERROR:
+                mEnableMultiSimSidecar.reset();
+                Log.i(TAG, "Failed to switch to DSDS without rebooting.");
+                ProgressDialogFragment.dismiss(getFragmentManager());
+                showErrorDialog(
+                        getString(R.string.dsds_activation_failure_title),
+                        getString(R.string.dsds_activation_failure_body_msg2));
+                break;
+        }
+    }
+
+    private void handleEnableSubscriptionAfterEnablingDsds() {
+        if (mIsEsimOperation) {
+            Log.i(TAG, "DSDS enabled, start to enable profile: " + mSubInfo.getSubscriptionId());
+            // For eSIM operations, we simply switch to the selected eSIM profile.
+            mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+            return;
+        }
+
+        Log.i(TAG, "DSDS enabled, start to enable pSIM profile.");
+        handleTogglePsimAction();
+        ProgressDialogFragment.dismiss(getFragmentManager());
+        finish();
+    }
+
+    private void handleTogglePsimAction() {
+        if (mSubscriptionManager.canDisablePhysicalSubscription() && mSubInfo != null) {
+            mSubscriptionManager.setUiccApplicationsEnabled(mSubInfo.getSubscriptionId(), mEnable);
+        } else {
+            Log.i(
+                    TAG,
+                    "The device does not support toggling pSIM. It is enough to just "
+                            + "enable the removable slot.");
+        }
+    }
+
     /* Handles the enabling SIM action. */
-    private void handleEnablingSubAction() {
-        Log.i(TAG, "handleEnableSub");
-        // TODO(b/160819390): Implement enabling eSIM/pSIM profile.
+    private void showEnableSubDialog() {
+        Log.i(TAG, "Handle subscription enabling.");
+        if (isDsdsConditionSatisfied()) {
+            showEnableDsdsConfirmDialog();
+            return;
+        }
+        if (!mIsEsimOperation && mTelMgr.isMultiSimEnabled()) {
+            Log.i(TAG, "Toggle on pSIM, no dialog displayed.");
+            handleTogglePsimAction();
+            finish();
+            return;
+        }
+        showEnableSimConfirmDialog();
+    }
+
+    private void showEnableDsdsConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_DSDS_CONFIRMATION,
+                getString(R.string.sim_action_enable_dsds_title),
+                getString(R.string.sim_action_enable_dsds_text),
+                getString(R.string.sim_action_continue),
+                getString(R.string.sim_action_no_thanks));
+    }
+
+    private void showRebootConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION,
+                getString(R.string.sim_action_restart_title),
+                getString(R.string.sim_action_enable_dsds_text),
+                getString(R.string.sim_action_reboot),
+                getString(R.string.cancel));
     }
 
     /* Displays the SIM toggling confirmation dialog. */
@@ -191,10 +360,116 @@
                 getString(R.string.cancel));
     }
 
-    /* Dismisses the SIM toggling confirmation dialog. */
-    private void dismissToggleSimConfirmDialog() {
-        if (mToggleSimConfirmDialog != null) {
-            mToggleSimConfirmDialog.dismiss();
+    private void showEnableSimConfirmDialog() {
+        List<SubscriptionInfo> activeSubs =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
+        SubscriptionInfo activeSub = activeSubs.isEmpty() ? null : activeSubs.get(0);
+        if (activeSub == null) {
+            Log.i(TAG, "No active subscriptions available.");
+            showNonSwitchSimConfirmDialog();
+            return;
         }
+        Log.i(TAG, "Found active subscription.");
+        boolean isBetweenEsim = mIsEsimOperation && activeSub.isEmbedded();
+        if (mTelMgr.isMultiSimEnabled() && !isBetweenEsim) {
+            showNonSwitchSimConfirmDialog();
+            return;
+        }
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
+                getSwitchSubscriptionTitle(),
+                getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
+                getSwitchDialogPosBtnText(),
+                getString(android.R.string.cancel));
+    }
+
+    private void showNonSwitchSimConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
+                getEnableSubscriptionTitle(),
+                null /* msg */,
+                getString(R.string.yes),
+                getString(android.R.string.cancel));
+    }
+
+    private String getSwitchDialogPosBtnText() {
+        return mIsEsimOperation
+                ? getString(
+                        R.string.sim_action_switch_sub_dialog_confirm, mSubInfo.getDisplayName())
+                : getString(R.string.sim_switch_button);
+    }
+
+    private String getEnableSubscriptionTitle() {
+        if (mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())) {
+            return getString(R.string.sim_action_enable_sub_dialog_title_without_carrier_name);
+        }
+        return getString(R.string.sim_action_enable_sub_dialog_title, mSubInfo.getDisplayName());
+    }
+
+    private String getSwitchSubscriptionTitle() {
+        if (mIsEsimOperation) {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_title, mSubInfo.getDisplayName());
+        }
+        return getString(R.string.sim_action_switch_psim_dialog_title);
+    }
+
+    private String getSwitchDialogBodyMsg(SubscriptionInfo activeSub, boolean betweenEsim) {
+        if (betweenEsim && mIsEsimOperation) {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_text_downloaded,
+                    mSubInfo.getDisplayName(),
+                    activeSub.getDisplayName());
+        } else if (mIsEsimOperation) {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_text,
+                    mSubInfo.getDisplayName(),
+                    activeSub.getDisplayName());
+        } else {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_text_single_sim,
+                    activeSub.getDisplayName());
+        }
+    }
+
+    private boolean isDsdsConditionSatisfied() {
+        if (mTelMgr.isMultiSimEnabled()) {
+            Log.i(TAG, "DSDS is already enabled. Condition not satisfied.");
+            return false;
+        }
+        if (mTelMgr.isMultiSimSupported() != TelephonyManager.MULTISIM_ALLOWED) {
+            Log.i(TAG, "Hardware does not support DSDS.");
+            return false;
+        }
+        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelMgr);
+        boolean isRemovableSimEnabled =
+                slotInfos.stream()
+                        .anyMatch(
+                                slot ->
+                                        slot != null
+                                                && slot.isRemovable()
+                                                && slot.getIsActive()
+                                                && slot.getCardStateInfo()
+                                                        == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
+        if (mIsEsimOperation && isRemovableSimEnabled) {
+            Log.i(TAG, "eSIM operation and removable SIM is enabled. DSDS condition satisfied.");
+            return true;
+        }
+        boolean isEsimProfileEnabled =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager).stream()
+                        .anyMatch(SubscriptionInfo::isEmbedded);
+        if (!mIsEsimOperation && isEsimProfileEnabled) {
+            Log.i(
+                    TAG,
+                    "Removable SIM operation and eSIM profile is enabled. DSDS condition"
+                        + " satisfied.");
+            return true;
+        }
+        Log.i(TAG, "DSDS condition not satisfied.");
+        return false;
     }
 }
diff --git a/src/com/android/settings/notification/ImportanceResetPreferenceController.java b/src/com/android/settings/notification/ImportanceResetPreferenceController.java
new file mode 100644
index 0000000..b374129
--- /dev/null
+++ b/src/com/android/settings/notification/ImportanceResetPreferenceController.java
@@ -0,0 +1,68 @@
+/*
+ * 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.notification;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.LayoutPreference;
+
+public class ImportanceResetPreferenceController extends BasePreferenceController implements
+        View.OnClickListener {
+
+    public static final String KEY = "asst_importance_reset";
+    private static final String TAG = "ResetImportanceButton";
+
+    private NotificationBackend mBackend;
+    private Button mButton;
+
+    public ImportanceResetPreferenceController(Context context, String key) {
+        super(context, key);
+        mBackend = new NotificationBackend();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        mButton = ((LayoutPreference) preference)
+                .findViewById(R.id.reset_importance_button);
+        mButton.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        mBackend.resetNotificationImportance();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+}
+
diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index 8677c02..a7d9f68 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -17,6 +17,8 @@
 
 package com.android.settings.notification;
 
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_COMPONENT_NAME;
 import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_PACKAGE_TITLE;
 import static com.android.internal.notification.NotificationAccessConfirmationActivityContract.EXTRA_USER_ID;
@@ -55,6 +57,8 @@
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+
         mNm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 
         mComponentName = getIntent().getParcelableExtra(EXTRA_COMPONENT_NAME);
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index c80ee97..6d51eb3 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -585,6 +585,14 @@
         sm.requestPinShortcut(shortcutInfo, null);
     }
 
+    public void resetNotificationImportance() {
+        try {
+            sINM.unlockAllNotificationChannels();
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
     /**
      * NotificationsSentState contains how often an app sends notifications and how recently it sent
      * one.
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index ac648a5..a17298f 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -62,8 +62,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
index ac39f88..1219143 100644
--- a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
@@ -98,7 +98,8 @@
         Intent appIntent = itemView.getContext().getPackageManager()
                 .getLaunchIntentForPackage(pkg);
         boolean isPendingIntentValid = pi != null && PendingIntent.getActivity(
-                itemView.getContext(), 0, pi.getIntent(), PendingIntent.FLAG_NO_CREATE) != null;
+                itemView.getContext(), 0, pi.getIntent(),
+                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_NO_CREATE) != null;
         if (isPendingIntentValid || appIntent != null) {
             itemView.setOnClickListener(v -> {
                 uiEventLogger.logWithInstanceIdAndPosition(
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index e393af5..a73b73a 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -105,8 +105,8 @@
 
     @Override
     protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     public static class IntentBuilder {
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index ff9bf1a..6e9cf98 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -94,8 +94,8 @@
 
     @Override
     protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     public static class IntentBuilder {
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 383ae4f..3ecff58 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -64,14 +64,14 @@
             return;
         }
         if (UserManager.get(this).isManagedProfile(credentialOwnerUserId)) {
-            setTheme(SetupWizardUtils.getTheme(getIntent()));
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             mConfirmCredentialTheme = ConfirmCredentialTheme.WORK;
         } else if (getIntent().getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)) {
             setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
             mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
         } else {
-            setTheme(SetupWizardUtils.getTheme(getIntent()));
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
         }
         super.onCreate(savedState);
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 5a0a2a6..7818f0d 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -31,7 +31,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
@@ -42,8 +41,6 @@
 import com.android.settings.R;
 import com.android.settings.SetupEncryptionInterstitial;
 import com.android.settings.SetupWizardUtils;
-import com.android.settings.biometrics.BiometricEnrollActivity;
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.utils.SettingsDividerItemDecoration;
 
 import com.google.android.setupdesign.GlifPreferenceLayout;
@@ -72,8 +69,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 754f99d..000ed3e 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -45,6 +45,7 @@
 import com.android.wifitrackerlib.WifiEntry;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
 
 import java.time.Clock;
 import java.time.ZoneOffset;
@@ -105,7 +106,7 @@
     protected void onCreate(Bundle savedInstanceState) {
         mIntent = getIntent();
         if (WizardManagerHelper.isSetupWizardIntent(mIntent)) {
-            setTheme(SetupWizardUtils.getTransparentTheme(mIntent));
+            setTheme(SetupWizardUtils.getTransparentTheme(this, mIntent));
         }
 
         super.onCreate(savedInstanceState);
@@ -151,13 +152,16 @@
         }
 
         if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
+            final int targetStyle = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                    ? R.style.SuwAlertDialogThemeCompat_DayNight :
+                    R.style.SuwAlertDialogThemeCompat_Light;
             if (mIsWifiTrackerLib) {
                 mDialog2 = WifiDialog2.createModal(this, this,
                         mNetworkDetailsTracker.getWifiEntry(),
-                        WifiConfigUiBase2.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+                        WifiConfigUiBase2.MODE_CONNECT, targetStyle);
             } else {
                 mDialog = WifiDialog.createModal(this, this, mAccessPoint,
-                        WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+                        WifiConfigUiBase.MODE_CONNECT, targetStyle);
             }
         } else {
             if (mIsWifiTrackerLib) {
diff --git a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
index a7daee6..499f66c 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
@@ -45,8 +45,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
         theme.applyStyle(R.style.SetupWizardPartnerResource, /* force */ true);
-        super.onApplyThemeResource(theme, resid, first);
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 }
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 9e68202..d6c49bc 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -129,6 +129,9 @@
         // SettingsActivity as base for all preference fragments.
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
+        switchBar.setSwitchBarText(
+                com.android.settingslib.R.string.wifi_hotspot_switch_on_text,
+                com.android.settingslib.R.string.wifi_hotspot_switch_off_text);
         mSwitchBarController = new WifiTetherSwitchBarController(activity, switchBar);
         getSettingsLifecycle().addObserver(mSwitchBarController);
         switchBar.show();
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 5f4f31b..5fddb80 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -18,20 +18,42 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
+import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
 import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.util.ThemeHelper;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class SetupWizardUtilsTest {
 
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        PartnerConfigHelper.resetInstance();
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
     @Test
     public void testCopySetupExtras() {
         Intent fromIntent = new Intent();
@@ -66,12 +88,13 @@
     }
 
     @Test
-    public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
+    public void testGetTheme_withIntentExtra_shouldReturnTheme() {
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF);
         Intent intent = createSetupWizardIntent();
         intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme);
     }
 
     @Test
@@ -79,26 +102,109 @@
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
         Intent intent = createSetupWizardIntent();
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_Light);
     }
 
     @Test
-    public void testGetTheme_glifV3Light_shouldReturnThemeResource() {
+    public void testGetTheme_whenSuwDayNightEnabledAndWithIntentExtra_shouldReturnDayNightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(true);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = createSetupWizardIntent();
+        intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_DayNight);
+    }
+
+    @Test
+    public void testGetTheme_glifV3Light_shouldReturnLightTheme() {
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);
         Intent intent = createSetupWizardIntent();
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
-        assertThat(SetupWizardUtils.getTransparentTheme(intent))
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_Light);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
                 .isEqualTo(R.style.GlifV3Theme_Light_Transparent);
     }
 
     @Test
-    public void testGetTheme_nonSuw_shouldReturnDayNightTheme() {
+    public void testGetTheme_glifV3_shouldReturnTheme() {
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_Transparent);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightDisabledAndGlifV2_shouldReturnLightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(false);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_Light);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightEnabledAndGlifV2_shouldReturnDayNightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(true);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_DayNight);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightDisabledAndGlifV3_shouldReturnTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(false);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_Transparent);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightEnabledAndGlifV3_shouldReturnDayNightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(true);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_DayNight);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_DayNight_Transparent);
+    }
+
+    @Test
+    public void testGetTheme_nonSuw_shouldReturnTheme() {
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);
         Intent intent = new Intent();
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme);
-        assertThat(SetupWizardUtils.getTransparentTheme(intent))
+        assertThat(SetupWizardUtils.getTheme(mContext, intent)).isEqualTo(R.style.GlifV3Theme);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
                 .isEqualTo(R.style.GlifV3Theme_Transparent);
     }
 
@@ -107,4 +213,65 @@
                 .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
                 .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true);
     }
+
+    private static final class FakePartnerContentProvider extends ContentProvider {
+
+        private final Bundle mFakeProviderDayNightEnabledResultBundle = new Bundle();
+
+        @Override
+        public boolean onCreate() {
+            return true;
+        }
+
+        @Override
+        public Cursor query(
+                @NonNull Uri uri,
+                @Nullable String[] projection,
+                @Nullable String selection,
+                @Nullable String[] selectionArgs,
+                @Nullable String sortOrder) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public String getType(@NonNull Uri uri) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(
+                @NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(
+                @NonNull Uri uri,
+                @Nullable ContentValues values,
+                @Nullable String selection,
+                @Nullable String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public Bundle call(String method, String arg, Bundle extras) {
+            if (TextUtils.equals(method, "isSuwDayNightEnabled")) {
+                return mFakeProviderDayNightEnabledResultBundle;
+            }
+            return null;
+        }
+
+        public FakePartnerContentProvider injectFakeDayNightEnabledResult(boolean dayNightEnabled) {
+            mFakeProviderDayNightEnabledResultBundle.putBoolean(
+                    "isSuwDayNightEnabled", dayNightEnabled);
+            return this;
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 9a157fe..6c62f19 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.EXTRA_SHORTCUT_TYPE;
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -62,6 +62,7 @@
     private static final String PLACEHOLDER_CLASS_NAME = PLACEHOLDER_PACKAGE_NAME + ".placeholder";
     private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
             PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+    private static final String PLACEHOLDER_DIALOG_TITLE = "title";
 
     private static final String SOFTWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
@@ -88,7 +89,7 @@
     @Test
     public void createFragment_shouldOnlyAddPreferencesOnce() {
         FragmentController.setupFragment(mFragment, FragmentActivity.class,
-                /* containerViewId= */ 0, /* bundle= */null);
+                /* containerViewId= */ 0, /* bundle= */ null);
 
         // execute exactly once
         verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
@@ -100,8 +101,10 @@
 
         mFragment.updateShortcutPreferenceData();
 
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         // Compare to default UserShortcutType
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
     }
 
     @Test
@@ -112,8 +115,9 @@
         putStringIntoSettings(HARDWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
         mFragment.updateShortcutPreferenceData();
 
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
-                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
     }
 
     @Test
@@ -125,28 +129,70 @@
         putUserShortcutTypeIntoSharedPreference(mContext, hardwareShortcut);
         mFragment.updateShortcutPreferenceData();
 
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.HARDWARE);
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE);
+    }
+
+    @Test
+    public void setupEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        mFragment.mShortcutPreference.setChecked(false);
+        mFragment.setupEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
+    }
+
+    @Test
+    public void setupEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        final PreferredShortcut hardwareShortcut = new PreferredShortcut(
+                PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        PreferredShortcuts.saveUserShortcutType(mContext, hardwareShortcut);
+        mFragment.mShortcutPreference.setChecked(true);
+        mFragment.setupEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.HARDWARE);
     }
 
     @Test
     @Config(shadows = ShadowFragment.class)
     public void restoreValueFromSavedInstanceState_assignToVariable() {
         mContext.setTheme(R.style.Theme_AppCompat);
-        final String dialogTitle = "title";
         final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
-                mContext, dialogTitle, this::callEmptyOnClicked);
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
         final Bundle savedInstanceState = new Bundle();
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
         mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
 
-        savedInstanceState.putInt(EXTRA_SHORTCUT_TYPE,
+        savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
                 UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
         mFragment.onCreate(savedInstanceState);
-        mFragment.initializeDialogCheckBox(dialog);
-        mFragment.updateUserShortcutType(true);
+        mFragment.setupEditShortcutDialog(dialog);
+        final int value = mFragment.getShortcutTypeCheckBoxValue();
+        mFragment.saveNonEmptyUserShortcutType(value);
 
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
-                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
-
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
     }
 
     private void putStringIntoSettings(String key, String componentName) {
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 5c0cb6d..3df6221 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -19,7 +19,7 @@
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
 import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
-import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.EXTRA_SHORTCUT_TYPE;
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -62,6 +62,7 @@
             PLACEHOLDER_PACKAGE_NAME + ".mock_a11y_service";
     private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
             PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+    private static final String PLACEHOLDER_DIALOG_TITLE = "title";
 
     private static final String SOFTWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
@@ -162,8 +163,10 @@
     public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
         mFragment.updateShortcutPreferenceData();
 
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         // Compare to default UserShortcutType
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
     }
 
     @Test
@@ -172,8 +175,9 @@
         setMagnificationTripleTapEnabled(/* enabled= */ true);
         mFragment.updateShortcutPreferenceData();
 
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
-                UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
     }
 
     @Test
@@ -184,27 +188,66 @@
         putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
         mFragment.updateShortcutPreferenceData();
 
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(UserShortcutType.TRIPLETAP);
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.TRIPLETAP);
+    }
+
+    @Test
+    public void setupMagnificationEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        mFragment.mShortcutPreference.setChecked(false);
+        mFragment.setupMagnificationEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
+    }
+
+    @Test
+    public void setupMagnificationEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        final PreferredShortcut tripletapShortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        PreferredShortcuts.saveUserShortcutType(mContext, tripletapShortcut);
+        mFragment.mShortcutPreference.setChecked(true);
+        mFragment.setupMagnificationEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.TRIPLETAP);
     }
 
     @Test
     @Config(shadows = ShadowFragment.class)
     public void restoreValueFromSavedInstanceState_assignToVariable() {
         mContext.setTheme(R.style.Theme_AppCompat);
-        final String dialogTitle = "title";
         final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
-                mContext, dialogTitle, this::callEmptyOnClicked);
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
         final Bundle savedInstanceState = new Bundle();
+        mFragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */ null);
 
-        savedInstanceState.putInt(EXTRA_SHORTCUT_TYPE,
-                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+        savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
+                UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
         mFragment.onCreate(savedInstanceState);
-        mFragment.initializeDialogCheckBox(dialog);
-        mFragment.updateUserShortcutType(true);
+        mFragment.setupMagnificationEditShortcutDialog(dialog);
+        final int value = mFragment.getShortcutTypeCheckBoxValue();
+        mFragment.saveNonEmptyUserShortcutType(value);
 
-        assertThat(mFragment.mUserShortcutTypes).isEqualTo(
-                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
-
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        assertThat(value).isEqualTo(6);
+        assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
     }
 
     private void putStringIntoSettings(String key, String componentName) {
diff --git a/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
new file mode 100644
index 0000000..1dfa65d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class ImportanceResetPreferenceControllerTest {
+
+    private static final String KEY = "asst_importance_reset";
+    private ImportanceResetPreferenceController mController;
+
+    @Mock
+    private PreferenceScreen mScreen;
+    private LayoutPreference mPreference;
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new LayoutPreference(mContext, R.layout.reset_importance_button);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mController = new ImportanceResetPreferenceController(mContext, KEY);
+        mController.displayPreference(mScreen);
+
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void onClick_callReset() {
+        final View view = mPreference.findViewById(R.id.reset_importance_button);
+        mController.updateState(mPreference);
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+        view.performClick();
+
+        verify(mBackend, times(1)).resetNotificationImportance();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
new file mode 100644
index 0000000..542d2ff
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppData;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Collections;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkScorerPickerPreferenceControllerTest {
+
+    private static final String TEST_SCORER_PACKAGE = "Test Package";
+    private static final String TEST_SCORER_CLASS = "Test Class";
+    private static final String TEST_SCORER_LABEL = "Test Label";
+
+    private Context mContext;
+    @Mock
+    private NetworkScoreManager mNetworkScorer;
+
+    private NetworkScorerPickerPreferenceController mController;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mNetworkScorer).when(mContext).getSystemService(Context.NETWORK_SCORE_SERVICE);
+
+        mController = new NetworkScorerPickerPreferenceController(mContext, "test_key");
+    }
+
+    @Test
+    public void testIsAvailable_shouldAlwaysReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_preferenceSetSummaryAsActiveScorerLabel() {
+
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+
+        when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setSummary(TEST_SCORER_LABEL);
+    }
+
+    @Test
+    public void updateState_scorersAvailable_noActiveScorer_preferenceSetSummaryToNone() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+        when(mNetworkScorer.getActiveScorer()).thenReturn(null);
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        Context context = ApplicationProvider.getApplicationContext();
+
+        verify(preference).setSummary(
+                resourceString("network_scorer_picker_none_preference"));
+    }
+
+    @Test
+    public void updateState_scorersAvailable_preferenceEnabled() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setEnabled(true);
+    }
+
+    @Test
+    public void updateState_noScorersAvailable_preferenceDisabled() {
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.emptyList());
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setEnabled(false);
+        verify(preference).setSummary(null);
+    }
+
+    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));
+    }
+}