Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I7faa6a1d71e74f239b9f87991c0c5bd7549143e7
Change-Id: I389c42db5facfc3cafbe7f030d3781cffa70dda8
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d7ad028..8426a30 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -663,6 +663,7 @@
         <activity
             android:name=".system.RegulatoryInfoDisplayActivity"
             android:label="@string/regulatory_labels"
+            android:exported="true"
             android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
                 <action android:name="android.settings.SHOW_REGULATORY_INFO" />
@@ -683,6 +684,7 @@
             android:theme="@style/ActionDialogTheme"
             android:excludeFromRecents="true"
             android:clearTaskOnLaunch="true"
+            android:exported="true"
             android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.net.wifi.action.REQUEST_ENABLE" />
@@ -714,7 +716,8 @@
                  android:exported="true"
                  android:permission="com.android.car.settings.SET_INITIAL_LOCK"/>
 
-        <receiver android:name=".bluetooth.BluetoothPairingRequest">
+        <receiver android:name=".bluetooth.BluetoothPairingRequest"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
             </intent-filter>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9376203..5679d98 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -150,7 +150,7 @@
     <string name="wifi_hotspot_security_title" msgid="2299925790743587725">"الأمان"</string>
     <string name="wifi_hotspot_wpa2_personal" msgid="7135181212837798318">"WPA2-Personal"</string>
     <string name="wifi_hotspot_security_none" msgid="2514844105085054386">"بلا"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="7685279281668988593">"نطاق نقطة وصول"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="7685279281668988593">"نطاق نقطة الوصول"</string>
     <string name="wifi_ap_band_config" msgid="6143905484067008736">"اختيار نطاق نقطة الوصول"</string>
     <string name="wifi_ap_choose_auto" msgid="3779526909841604566">"تلقائي"</string>
     <string name="wifi_ap_choose_2G" msgid="6356913773766753502">"نطاق بتردد ٢٫٤ غيغاهرتز"</string>
@@ -165,7 +165,7 @@
     <string name="wifi_ask_enable" msgid="4452418245680754578">"هناك رغبة من <xliff:g id="REQUESTER">%s</xliff:g> في تفعيل شبكة Wi-Fi."</string>
     <string name="wifi_ask_disable" msgid="2949290055916181553">"هناك رغبة من <xliff:g id="REQUESTER">%s</xliff:g> في إيقاف شبكة Wi-Fi."</string>
     <string name="wifi_error" msgid="3105105447117289410">"خطأ"</string>
-    <string name="bluetooth_settings_title" msgid="3794688574569688649">"بلوتوث"</string>
+    <string name="bluetooth_settings_title" msgid="3794688574569688649">"البلوتوث"</string>
     <string name="bluetooth_device" msgid="3178478829314083240">"جهاز بدون اسم"</string>
     <string name="bluetooth_paired_devices" msgid="6463199569164652410">"الأجهزة المقترنة"</string>
     <string name="bluetooth_pair_new_device" msgid="6948753485443263095">"إقران جهاز جديد"</string>
@@ -217,7 +217,7 @@
     <string name="tts_speech_rate" msgid="4512944877291943133">"معدل سرعة الكلام"</string>
     <string name="tts_pitch" msgid="2389171233852604923">"درجة الصوت"</string>
     <string name="tts_reset" msgid="6289481549801844709">"إعادة الضبط"</string>
-    <string name="sound_settings" msgid="3072423952331872246">"صوت"</string>
+    <string name="sound_settings" msgid="3072423952331872246">"الصوت"</string>
     <string name="ring_volume_title" msgid="3135241004980719442">"مستوى صوت الرنين"</string>
     <string name="navi_volume_title" msgid="946292066759195165">"مستوى صوت التنقل"</string>
     <string name="incoming_call_volume_title" msgid="6972117872424656876">"نغمة الرنين"</string>
@@ -228,7 +228,7 @@
     <string name="ringtone_title" msgid="8370531086214517972">"نغمة رنين الهاتف"</string>
     <string name="notification_ringtone_title" msgid="8661716239594010288">"الصوت التلقائي للإشعارات"</string>
     <string name="alarm_ringtone_title" msgid="3257364170646440908">"الصوت التلقائي للمنبّه"</string>
-    <string name="units_settings" msgid="402325305096925886">"وحدة"</string>
+    <string name="units_settings" msgid="402325305096925886">"وحدات العرض"</string>
     <string name="units_speed_title" msgid="7115143916747108160">"السرعة"</string>
     <string name="units_distance_title" msgid="6257691565990474635">"المسافة"</string>
     <string name="units_fuel_consumption_title" msgid="6415108114453652570">"استهلاك الوقود"</string>
@@ -279,7 +279,7 @@
     <string name="apps_and_notifications_settings" msgid="8704585874333781975">"التطبيقات والإشعارات"</string>
     <string name="all_applications" msgid="7798210477486822168">"إظهار جميع التطبيقات"</string>
     <string name="default_applications" msgid="1558183275638697087">"التطبيقات التلقائية"</string>
-    <string name="app_permissions" msgid="32799922508313948">"أذونات التطبيق"</string>
+    <string name="app_permissions" msgid="32799922508313948">"أذونات التطبيقات"</string>
     <string name="app_permissions_summary" msgid="1842858532315056367">"التطبيقات التي تستخدم <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="applications_settings" msgid="794261395191035632">"معلومات التطبيق"</string>
     <string name="force_stop" msgid="2153183697014720520">"فرض الإيقاف"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index fcaf495..ad06157 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"অগ্ৰাহ্য কৰক"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"গাড়ী চলাই থকা সময়ত এই সুবিধাটো উপলব্ধ নহয়"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"গাড়ী চলাই থকা সময়ত ব্য়ৱহাৰকাৰীক যোগ কৰিব নোৱাৰি"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"সন্ধান কৰক"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9ff229c..35d7fe4 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -311,7 +311,7 @@
     <string name="assist_access_screenshot_title" msgid="2855956879971465044">"Выкарыстоўваць здымак экрана"</string>
     <string name="assist_access_screenshot_summary" msgid="6246496926635145782">"Дазволіць праграме-памочніку мець доступ да відарыса на экране"</string>
     <string name="voice_input_settings_title" msgid="3238707827815647526">"Галасавы ўвод"</string>
-    <string name="autofill_settings_title" msgid="1188754272680049972">"Сэрвіс аўтазапаўнення"</string>
+    <string name="autofill_settings_title" msgid="1188754272680049972">"Служба аўтазапаўнення"</string>
     <string name="app_list_preference_none" msgid="7753357799926715901">"Няма"</string>
     <string name="default_app_selected_app" msgid="5289396663745484773">"Выбрана"</string>
     <string name="assistant_security_warning" msgid="1844807956967428012">"Памочнік атрымае доступ да інфармацыі пра праграмы, якія выкарыстоўваюцца ў вашай сістэме, у тым ліку да інфармацыі, бачнай на вашым экране ці даступнай у праграмах."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 19cf2b6..cfc05eb 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"খারিজ করুন"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ড্রাইভ করার সময় এই ফিচার কাজ করবে না"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ড্রাইভ করার সময় ব্যবহারকারীকে যোগ করতে পারবেন না"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"সার্চ"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 42a8287..f61e33b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -576,7 +576,7 @@
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"Ukloniti zaključavanje ekrana?"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"Svi će imati pristup vašem računu"</string>
     <string name="lock_settings_enter_pin" msgid="1669172111244633904">"Unesite svoj PIN"</string>
-    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Unesite svoju lozinku"</string>
+    <string name="lock_settings_enter_password" msgid="2636669926649496367">"Unesite lozinku"</string>
     <string name="choose_lock_pin_message" msgid="2963792070267774417">"Postavite PIN radi sigurnosti"</string>
     <string name="confirm_your_pin_header" msgid="9096581288537156102">"Ponovo unesite PIN"</string>
     <string name="choose_lock_pin_hints" msgid="7362906249992020844">"PIN mora sadržavati najmanje 4 cifre"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7b04a0d..65c7e4d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -216,12 +216,12 @@
     <string name="sound_settings" msgid="3072423952331872246">"Zvuk"</string>
     <string name="ring_volume_title" msgid="3135241004980719442">"Hlasitost vyzvánění"</string>
     <string name="navi_volume_title" msgid="946292066759195165">"Hlasitost navigace"</string>
-    <string name="incoming_call_volume_title" msgid="6972117872424656876">"Vyzváněcí tón"</string>
+    <string name="incoming_call_volume_title" msgid="6972117872424656876">"Vyzvánění"</string>
     <string name="notification_volume_title" msgid="6749411263197157876">"Oznámení"</string>
     <string name="media_volume_title" msgid="6697416686272606865">"Média"</string>
     <string name="media_volume_summary" msgid="2961762827637127239">"Umožňuje nastavit hlasitost hudby a videí"</string>
     <string name="alarm_volume_title" msgid="840384014895796587">"Budík"</string>
-    <string name="ringtone_title" msgid="8370531086214517972">"Vyzváněcí tón telefonu"</string>
+    <string name="ringtone_title" msgid="8370531086214517972">"Vyzvánění telefonu"</string>
     <string name="notification_ringtone_title" msgid="8661716239594010288">"Výchozí zvuk oznámení"</string>
     <string name="alarm_ringtone_title" msgid="3257364170646440908">"Výchozí zvuk budíku"</string>
     <string name="units_settings" msgid="402325305096925886">"Jednotky"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 382293d..b381488 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -305,11 +305,11 @@
     <string name="assist_access_screenshot_title" msgid="2855956879971465044">"Screenshot verwenden"</string>
     <string name="assist_access_screenshot_summary" msgid="6246496926635145782">"Der Assistent-App den Zugriff auf eine Momentaufnahme deines Bildschirminhalts (Screenshot) gestatten"</string>
     <string name="voice_input_settings_title" msgid="3238707827815647526">"Spracheingabe"</string>
-    <string name="autofill_settings_title" msgid="1188754272680049972">"AutoFill-Dienst"</string>
+    <string name="autofill_settings_title" msgid="1188754272680049972">"Dienst für automatisches Ausfüllen"</string>
     <string name="app_list_preference_none" msgid="7753357799926715901">"Keine"</string>
     <string name="default_app_selected_app" msgid="5289396663745484773">"Ausgewählt"</string>
     <string name="assistant_security_warning" msgid="1844807956967428012">"Der Assistent kann Informationen zu Apps abrufen, die du auf deinem System verwendest, einschließlich Informationen, die auf deinem Bildschirm angezeigt werden oder die in Apps zugänglich sind."</string>
-    <string name="autofill_confirmation_message" msgid="1832984461556991378">"&lt;b&gt;Sorge dafür, dass dieser App vertraut wird.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google AutoFill&gt;%1$s&lt;/xliff:g&gt; entscheidet dann anhand der Inhalte auf dem Display, welche Informationen automatisch ausgefüllt werden können."</string>
+    <string name="autofill_confirmation_message" msgid="1832984461556991378">"&lt;b&gt;Sorge dafür, dass dieser App vertraut wird.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatisches Ausfüllen von Google&gt;%1$s&lt;/xliff:g&gt; entscheidet dann anhand der Inhalte auf dem Display, welche Informationen automatisch ausgefüllt werden können."</string>
     <string name="autofill_add_service" msgid="6413893366443609951">"Dienst hinzufügen"</string>
     <string name="app_launch_domain_links_title" msgid="774480184927726651">"Links öffnen"</string>
     <string name="domain_url_section_title" msgid="9070403140947787214">"Installierte Apps"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 338df9e..ffd8c56 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -525,7 +525,7 @@
     <string name="account_sync_title" msgid="6541844336300236915">"Kontuaren sinkronizazioa"</string>
     <string name="account_sync_summary_some_on" msgid="4525960296068027182">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta daukate sinkronizazioa"</string>
     <string name="account_sync_summary_all_on" msgid="3652264471870312725">"Elementu guztiek aktibatuta daukate sinkronizazioa"</string>
-    <string name="account_sync_summary_all_off" msgid="6550959714035312414">"Elementu guztiek desaktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_all_off" msgid="6550959714035312414">"Elementu guztiek desaktibatuta daukate sinkronizazioa"</string>
     <string name="sync_disabled" msgid="393531064334628258">"Sinkroniz. DESAKTIBATUTA"</string>
     <string name="sync_error" msgid="6698021343089247914">"Sinkronizazio-errorea"</string>
     <string name="last_synced" msgid="4745124489150101529">"Azken sinkronizazioa: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index a9a4658..87fa14f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -342,7 +342,7 @@
     <string name="usage_access_title" msgid="7153427122072303254">"Accès aux données utilisation"</string>
     <string name="usage_access_description" msgid="2413168719257435422">"L\'accès aux données d\'utilisation permet à une application d\'effectuer le suivi des applications que vous utilisez, de la fréquence d\'utilisation, du fournisseur de services, des paramètres de langue et d\'autres détails."</string>
     <string name="wifi_control_title" msgid="5660436566907731929">"Gestion du Wi-Fi"</string>
-    <string name="wifi_control_description" msgid="6021926850423169261">"Le contrôle Wi-Fi permet d\'autoriser une application à activer ou à désactiver le Wi-Fi, à rechercher les réseaux Wi-Fi et à s\'y connecter, à ajouter ou supprimer des réseaux, ou à lancer un point d\'accès local uniquement."</string>
+    <string name="wifi_control_description" msgid="6021926850423169261">"Le contrôle Wi-Fi permet d\'autoriser une application à activer ou à désactiver le Wi-Fi, à rechercher les réseaux Wi-Fi et à s\'y connecter, à ajouter ou retirer des réseaux, ou à lancer un point d\'accès local uniquement."</string>
     <string name="more_special_access_title" msgid="166115485446645971">"Plus"</string>
     <string name="location_settings_title" msgid="901334356682423679">"Lieu"</string>
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Récentes demandes de localisation"</string>
@@ -521,7 +521,7 @@
     <string name="remove_account_title" msgid="8840386525787836381">"Supprimer le compte"</string>
     <string name="really_remove_account_title" msgid="3555164432587924900">"Supprimer le compte?"</string>
     <string name="really_remove_account_message" msgid="4296769280849579900">"La suppression de ce compte entraînera la suppression de tous les messages, les contacts et les autres données de l\'appareil."</string>
-    <string name="remove_account_error_title" msgid="8368044943174826635">"Impossible de supprimer le compte."</string>
+    <string name="remove_account_error_title" msgid="8368044943174826635">"Impossible de retirer le compte."</string>
     <string name="account_sync_title" msgid="6541844336300236915">"Synchronisation du compte"</string>
     <string name="account_sync_summary_some_on" msgid="4525960296068027182">"La synchronisation est activée pour <xliff:g id="ID_1">%1$d</xliff:g> éléments sur <xliff:g id="ID_2">%2$d</xliff:g>"</string>
     <string name="account_sync_summary_all_on" msgid="3652264471870312725">"La synchronisation est activée pour tous les éléments"</string>
@@ -627,8 +627,8 @@
     <string name="setup_lock_settings_options_button_label" msgid="3337845811029780896">"Options de verrouillage de l\'écran"</string>
     <string name="build_info_fmt" msgid="5592554123908086426">"<xliff:g id="FINGERPRINT">%1$s</xliff:g>\n<xliff:g id="DATE">%2$s</xliff:g> : il y a <xliff:g id="NUM_DAYS">%3$s</xliff:g> jours"</string>
     <string name="credentials_reset" msgid="873900550885788639">"Effacer les authentifiants"</string>
-    <string name="credentials_reset_summary" msgid="6067911547500459637">"Supprimer tous les certificats"</string>
-    <string name="credentials_reset_hint" msgid="3459271621754137661">"Voulez-vous supprimer l\'intégralité du contenu?"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Retirer tous les certificats"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Voulez-vous retirer l\'intégralité du contenu?"</string>
     <string name="credentials_erased" msgid="2515915439705550379">"Le stockage des authentifiants est effacé."</string>
     <string name="credentials_not_erased" msgid="6118567459076742720">"Impossible d\'effacer le stockage des authentifiants."</string>
     <string name="forget" msgid="3971143908183848527">"Oublier"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6425b46..be2109a 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"છોડી દો"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ડ્રાઇવિંગ કરતી વખતે આ સુવિધા ઉપલબ્ધ નથી"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ડ્રાઇવ કરતી વખતે વપરાશકર્તાને ઉમેરી શકાતા નથી"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"શોધ"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 983c526..f89871b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -70,7 +70,7 @@
     <string name="launch_manage_plan_text" msgid="906657488611815787">"Lihat paket"</string>
     <string name="app_data_usage" msgid="3878609885080232877">"Penggunaan kuota aplikasi"</string>
     <string name="data_usage_app_restricted" msgid="4570970078120010951">"terbatas"</string>
-    <string name="cycle_reset_day_of_month_picker_title" msgid="1374568502823735361">"Tanggal penyetelan ulang siklus penggunaan"</string>
+    <string name="cycle_reset_day_of_month_picker_title" msgid="1374568502823735361">"Tanggal peresetan siklus penggunaan"</string>
     <string name="cycle_reset_day_of_month_picker_subtitle" msgid="5361061448258189846">"Tanggal setiap bulannya:"</string>
     <string name="cycle_reset_day_of_month_picker_positive_button" msgid="6919858010423269305">"Setel"</string>
     <string name="data_warning_limit_title" msgid="4950868241810828601">"Peringatan &amp; batas data"</string>
@@ -208,7 +208,7 @@
     <string name="text_to_speech_current_engine" msgid="8133107484909612597">"Mesin saat ini"</string>
     <string name="tts_speech_rate" msgid="4512944877291943133">"Laju Bicara"</string>
     <string name="tts_pitch" msgid="2389171233852604923">"Tinggi nada"</string>
-    <string name="tts_reset" msgid="6289481549801844709">"Setel ulang"</string>
+    <string name="tts_reset" msgid="6289481549801844709">"Reset"</string>
     <string name="sound_settings" msgid="3072423952331872246">"Suara"</string>
     <string name="ring_volume_title" msgid="3135241004980719442">"Volume dering"</string>
     <string name="navi_volume_title" msgid="946292066759195165">"Volume navigasi"</string>
@@ -393,8 +393,8 @@
     <string name="show_dev_already" msgid="1678087328973865736">"Tidak perlu, Anda sudah menjadi developer."</string>
     <string name="developer_options_settings" msgid="1530739225109118480">"Opsi developer"</string>
     <string name="reset_options_title" msgid="4388902952861833420">"Opsi reset"</string>
-    <string name="reset_options_summary" msgid="5508201367420359293">"Menyetel ulang jaringan, aplikasi, atau perangkat"</string>
-    <string name="reset_network_title" msgid="1284233059990797263">"Setel ulang jaringan"</string>
+    <string name="reset_options_summary" msgid="5508201367420359293">"Mereset jaringan, aplikasi, atau perangkat"</string>
+    <string name="reset_network_title" msgid="1284233059990797263">"Reset jaringan"</string>
     <string name="reset_network_desc" msgid="602381374544634925">"Tindakan ini akan menyetel ulang semua setelan jaringan, termasuk:"</string>
     <string name="reset_network_item_wifi" msgid="7569481589699982698"><li>"Wi‑Fi"</li></string>
     <string name="reset_network_item_mobile" msgid="5747282716664480997"><li>"Kuota"</li></string>
@@ -403,21 +403,21 @@
     <string name="reset_esim_desc" msgid="1437276625485586740">"Tindakan ini tidak akan membatalkan paket layanan Anda."</string>
     <string name="reset_esim_error_title" msgid="7245109418130525492">"Tidak dapat menyetel ulang eSIM"</string>
     <string name="reset_network_select" msgid="2433825874868038739">"Pilih jaringan"</string>
-    <string name="reset_network_button_text" msgid="8374174455632765033">"Setel ulang setelan"</string>
-    <string name="reset_network_confirm_title" msgid="5255502723840197663">"Setel ulang?"</string>
-    <string name="reset_network_confirm_desc" msgid="7721698076856330212">"Setel ulang semua setelan jaringan? Tindakan ini tidak dapat diurungkan!"</string>
-    <string name="reset_network_confirm_button_text" msgid="5246859685069024851">"Setel ulang setelan"</string>
-    <string name="reset_network_complete_toast" msgid="3804108209431416865">"Setelan jaringan telah disetel ulang"</string>
-    <string name="reset_app_pref_title" msgid="5855420038951743992">"Setel ulang preferensi aplikasi"</string>
+    <string name="reset_network_button_text" msgid="8374174455632765033">"Reset setelan"</string>
+    <string name="reset_network_confirm_title" msgid="5255502723840197663">"Reset?"</string>
+    <string name="reset_network_confirm_desc" msgid="7721698076856330212">"Reset semua setelan jaringan? Tindakan ini tidak dapat diurungkan!"</string>
+    <string name="reset_network_confirm_button_text" msgid="5246859685069024851">"Reset setelan"</string>
+    <string name="reset_network_complete_toast" msgid="3804108209431416865">"Setelan jaringan telah direset"</string>
+    <string name="reset_app_pref_title" msgid="5855420038951743992">"Reset preferensi aplikasi"</string>
     <string name="reset_app_pref_desc" msgid="579392665146962149">"Tindakan ini akan menyetel ulang semua preferensi untuk:\n\n"<li>"Aplikasi yang dinonaktifkan"</li>\n<li>"Notifikasi aplikasi yang dinonaktifkan"</li>\n<li>"Aplikasi default untuk tindakan"</li>\n<li>"Batasan data latar belakang untuk aplikasi"</li>\n<li>"Batasan izin apa pun"</li>\n\n"Data aplikasi Anda tidak akan hilang."</string>
-    <string name="reset_app_pref_button_text" msgid="6270820447321231609">"Setel ulang aplikasi"</string>
-    <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"Preferensi aplikasi telah disetel ulang"</string>
+    <string name="reset_app_pref_button_text" msgid="6270820447321231609">"Reset aplikasi"</string>
+    <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"Preferensi aplikasi telah direset"</string>
     <string name="master_clear_title" msgid="8515335233363214414">"Hapus semua (reset ke setelan pabrik)"</string>
     <string name="master_clear_desc" msgid="9058719802779893535">"Tindakan ini akan menghapus semua data dari head unit kendaraan, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang diunduh"</li></string>
     <string name="master_clear_accounts" msgid="7797522012993567494">"Saat ini Anda telah login ke akun berikut:"</string>
     <string name="master_clear_other_users_present" msgid="8383376863095743337">"Ada pengguna lain yang aktif di kendaraan ini."</string>
-    <string name="master_clear_button_text" msgid="8010754220392741160">"Setel ulang kendaraan"</string>
-    <string name="master_clear_confirm_title" msgid="8646455623132887370">"Setel ulang?"</string>
+    <string name="master_clear_button_text" msgid="8010754220392741160">"Reset kendaraan"</string>
+    <string name="master_clear_confirm_title" msgid="8646455623132887370">"Reset?"</string>
     <string name="master_clear_confirm_desc" msgid="8920446291698038558">"Hapus semua informasi pribadi dan aplikasi yang didownload? Tindakan ini tidak dapat diurungkan!"</string>
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Hapus semua"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Menghapus"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index d1a680b..23ae5fc 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ವಜಾಗೊಳಿಸಿ"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ಈ ವೈಶಿಷ್ಟ್ಯ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"ಹುಡುಕಿ"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 27246b1..402c443 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ഡിസ്‌മിസ് ചെയ്യുക"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ഡ്രൈവ് ചെയ്യുമ്പോൾ ഫീച്ചർ ലഭ്യമല്ല"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ഡ്രൈവ് ചെയ്യുമ്പോൾ ഉപയോക്താവിനെ ചേർക്കാനാവില്ല"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"തിരയുക"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 62fffe8..14d6e65 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"डिसमिस करा"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ड्राइव्ह करताना वैशिष्ट्य उपलब्ध नाही"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ड्राइव्ह करत असताना वापरकर्त्याला जोडू शकत नाही"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"शोधा"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index f238ebd..12d856e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -309,7 +309,7 @@
     <string name="app_list_preference_none" msgid="7753357799926715901">"कुनै पनि होइन"</string>
     <string name="default_app_selected_app" msgid="5289396663745484773">"चयन गरिएको"</string>
     <string name="assistant_security_warning" msgid="1844807956967428012">"सहायकले तपाईंको स्क्रिनमा देख्न सकिने वा अनुप्रयोगहरूभित्र पहुँच राख्न सकिने जानकारीलगायत तपाईंको प्रणालीमा प्रयोगमा रहेका अनुप्रयोगहरूबारे जानकारी पढ्न सक्ने छ।"</string>
-    <string name="autofill_confirmation_message" msgid="1832984461556991378">"&lt;b&gt;तपाईं यो अनुप्रयोगमाथि भरोसा गर्नुहुन्छ भन्ने कुरा सुनिश्चित गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्न सकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
+    <string name="autofill_confirmation_message" msgid="1832984461556991378">"&lt;b&gt;तपाईं यो एपमाथि भरोसा गर्नुहुन्छ भन्ने कुरा सुनिश्चित गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्न सकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
     <string name="autofill_add_service" msgid="6413893366443609951">"सेवा थप्नुहोस्"</string>
     <string name="app_launch_domain_links_title" msgid="774480184927726651">"लिंकहरू खोल्दै"</string>
     <string name="domain_url_section_title" msgid="9070403140947787214">"स्थापना गरिएका एपहरू"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f73f17b..97fafcc 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -638,7 +638,7 @@
     <string name="remove_button" msgid="6664656962868194178">"କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="cancel" msgid="750286395700355455">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
     <string name="allow" msgid="7519431342750394402">"ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="deny" msgid="340512788979930804">"ପ୍ରତ୍ୟାଖ୍ୟାନ କରନ୍ତୁ"</string>
+    <string name="deny" msgid="340512788979930804">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
     <string name="backspace_key" msgid="1545590866688979099">"Backspace କୀ"</string>
     <string name="enter_key" msgid="2121394305541579468">"କୀ ଦବାନ୍ତୁ"</string>
     <string name="exit_retail_button_text" msgid="6093240315583384473">"ଡେମୋରୁ ବାହାରିଯା’ନ୍ତୁ"</string>
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ଖାରଜ କରନ୍ତୁ"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ଗାଡ଼ି ଚଲାଇବା ସମୟରେ ଫିଚର୍ ଉପଲବ୍ଧ ହେବ ନାହିଁ"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ଗାଡ଼ି ଚଲାଇବା ବେଳେ ଉପଯୋଗକର୍ତ୍ତା ଯୋଗ କରିପାରିବେ ନାହିଁ"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"ସନ୍ଧାନ"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index cff8608..35ac1d1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -74,7 +74,7 @@
     <string name="cycle_reset_day_of_month_picker_subtitle" msgid="5361061448258189846">"Data de cada mês:"</string>
     <string name="cycle_reset_day_of_month_picker_positive_button" msgid="6919858010423269305">"Definir"</string>
     <string name="data_warning_limit_title" msgid="4950868241810828601">"Limite e aviso de dados"</string>
-    <string name="app_usage_cycle" msgid="8445927080245880296">"Ciclo de utilização de dados da aplic."</string>
+    <string name="app_usage_cycle" msgid="8445927080245880296">"Ciclo de utilização de dados da app"</string>
     <string name="set_data_warning" msgid="6628236612886588097">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="116776633806885370">"Aviso de dados"</string>
     <string name="set_data_limit" msgid="7136539812414500084">"Definir limite de dados"</string>
@@ -270,9 +270,9 @@
     <string name="units_unit_name_liter_per_hundred_kilometers" msgid="4867647387452453552">"Litros por cem quilómetros"</string>
     <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps e notificações"</string>
     <string name="all_applications" msgid="7798210477486822168">"Mostrar todas as aplicações"</string>
-    <string name="default_applications" msgid="1558183275638697087">"Aplicações predefinidas"</string>
-    <string name="app_permissions" msgid="32799922508313948">"Autorizações da aplicação"</string>
-    <string name="app_permissions_summary" msgid="1842858532315056367">"Aplicações que utilizam <xliff:g id="APPS">%1$s</xliff:g>"</string>
+    <string name="default_applications" msgid="1558183275638697087">"Apps predefinidas"</string>
+    <string name="app_permissions" msgid="32799922508313948">"Autorizações da app"</string>
+    <string name="app_permissions_summary" msgid="1842858532315056367">"Apps que utilizam <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="applications_settings" msgid="794261395191035632">"Informações da aplicação"</string>
     <string name="force_stop" msgid="2153183697014720520">"Forçar paragem"</string>
     <string name="force_stop_dialog_title" msgid="3342850939200388694">"Pretende forçar a paragem?"</string>
@@ -299,11 +299,11 @@
     </plurals>
     <string name="direct_boot_unaware_dialog_message_car" msgid="2857599310518724080">"Nota: após reiniciar, só é possível iniciar esta aplicação quando o veículo for desbloqueado."</string>
     <string name="assist_and_voice_input_settings" msgid="8813195157136637132">"Assistente e entrada de texto por voz"</string>
-    <string name="assist_app_settings" msgid="9085261410166776497">"Aplicação de assistência"</string>
+    <string name="assist_app_settings" msgid="9085261410166776497">"App de assistência"</string>
     <string name="assist_access_context_title" msgid="8034851731390785301">"Utilizar o texto do ecrã"</string>
-    <string name="assist_access_context_summary" msgid="2374281280599443774">"Permitir que a aplicação de assistência aceda ao conteúdo do ecrã como texto"</string>
+    <string name="assist_access_context_summary" msgid="2374281280599443774">"Permitir que a app de assistência aceda ao conteúdo do ecrã como texto"</string>
     <string name="assist_access_screenshot_title" msgid="2855956879971465044">"Utilizar a captura de ecrã"</string>
-    <string name="assist_access_screenshot_summary" msgid="6246496926635145782">"Permitir que a aplicação de assistência aceda a uma imagem do ecrã"</string>
+    <string name="assist_access_screenshot_summary" msgid="6246496926635145782">"Permitir que a app de assistência aceda a uma imagem do ecrã"</string>
     <string name="voice_input_settings_title" msgid="3238707827815647526">"Entrada de texto por voz"</string>
     <string name="autofill_settings_title" msgid="1188754272680049972">"Serviço de preenchimento automático"</string>
     <string name="app_list_preference_none" msgid="7753357799926715901">"Nenhuma"</string>
@@ -312,7 +312,7 @@
     <string name="autofill_confirmation_message" msgid="1832984461556991378">"&lt;b&gt;Certifique-se de que confia nesta aplicação&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
     <string name="autofill_add_service" msgid="6413893366443609951">"Adicionar serviço"</string>
     <string name="app_launch_domain_links_title" msgid="774480184927726651">"Abertura de links"</string>
-    <string name="domain_url_section_title" msgid="9070403140947787214">"Aplicações instaladas"</string>
+    <string name="domain_url_section_title" msgid="9070403140947787214">"Apps instaladas"</string>
     <string name="domain_urls_summary_none" msgid="3077803215088293183">"Não abrir links compatíveis"</string>
     <string name="domain_urls_summary_one" msgid="5072257421806034237">"Abrir <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="5523153458016701725">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> e outros URLs"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b460080..ea60bf2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -289,7 +289,7 @@
     <string name="not_installed" msgid="4218816013370552746">"Pre tohto používateľa nebola nainštalovaná"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Povolenia"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Upozornenia"</string>
-    <string name="storage_application_label" msgid="5911779903670978586">"Úložisko a vyrovnávacia pamäť"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Ukladací priestor a vyrovnávacia pamäť"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verzia: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Neboli udelené žiadne povolenia"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Neboli požadované žiadne povolenia"</string>
@@ -507,7 +507,7 @@
     <string name="storage_data_size_label" msgid="5022911581004239367">"Údaje používateľa"</string>
     <string name="storage_cache_size_label" msgid="6361308766707419555">"Vyrovnávacia pamäť"</string>
     <string name="storage_total_size_label" msgid="3892138268243791912">"Celkove"</string>
-    <string name="storage_clear_user_data_text" msgid="8787615136779130680">"Vymazať ukladací priestor"</string>
+    <string name="storage_clear_user_data_text" msgid="8787615136779130680">"Vymazať obsah úložiska"</string>
     <string name="storage_clear_cache_btn_text" msgid="8449547925966775612">"Vymazať vyrovnávaciu pamäť"</string>
     <string name="storage_clear_data_dlg_title" msgid="5863775997588969879">"Chcete odstrániť dáta aplikácie?"</string>
     <string name="storage_clear_data_dlg_text" msgid="795055288575727801">"Všetky údaje tejto aplikácie vrátane súborov, nastavení, účtov, databáz atď. budú navždy odstránené."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 178b9b4..c130d57 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -298,7 +298,7 @@
       <item quantity="one">Ruhusa <xliff:g id="COUNT_0">%d</xliff:g> ya ziada</item>
     </plurals>
     <string name="direct_boot_unaware_dialog_message_car" msgid="2857599310518724080">"Kumbuka: Baada ya kuwasha tena programu hii, hutaweza kuitumia hadi utakapofungua gari lako."</string>
-    <string name="assist_and_voice_input_settings" msgid="8813195157136637132">"Mratibu na kuweka data kwa kutamka"</string>
+    <string name="assist_and_voice_input_settings" msgid="8813195157136637132">"Maagizo na kuweka data kwa kutamka"</string>
     <string name="assist_app_settings" msgid="9085261410166776497">"Programu ya usaidizi"</string>
     <string name="assist_access_context_title" msgid="8034851731390785301">"Tumia maandishi kutoka kwenye skrini"</string>
     <string name="assist_access_context_summary" msgid="2374281280599443774">"Ruhusu programu ya usaidizi kufikia maudhui ya skrini katika muundo wa maandishi"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 9d71d86..152d6af 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"நிராகரி"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"வாகனம் ஓட்டும்போது இந்த அம்சத்தைப் பயன்படுத்த இயலாது"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"வாகனம் ஓட்டும்போது பயனரைச் சேர்க்க முடியாது"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"தேடுக"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 02a94c3..1663250 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -648,5 +648,5 @@
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"విస్మరించు"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"డ్రైవింగ్ చేస్తున్నప్పుడు ఈ ఫీచర్ అందుబాటులో ఉండదు"</string>
     <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"డ్రైవింగ్ చేస్తున్నప్పుడు, యూజర్‌ను జోడించడం సాధ్యం కాదు"</string>
-    <string name="default_search_query" msgid="3137420627428857068">"శోధన"</string>
+    <string name="default_search_query" msgid="3137420627428857068">"Search"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1166853..0399127 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -643,7 +643,7 @@
     <string name="enter_key" msgid="2121394305541579468">"Enter کلید"</string>
     <string name="exit_retail_button_text" msgid="6093240315583384473">"ڈیمو سے باہر نکلیں"</string>
     <string name="exit_retail_mode_dialog_title" msgid="7970631760237469168">"ڈیمو موڈ سے باہر نکلیں"</string>
-    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"اس سے ڈیمو اکاؤنٹ اور فیکٹری ڈیٹا کی دوبارہ ترتیب کا سسٹم حذف ہو جائے گا۔ تمام صارف ڈیٹا غائب ہو جائیں گے۔"</string>
+    <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"اس سے ڈیمو اکاؤنٹ اور فیکٹری ڈیٹا ری سیٹ کا سسٹم حذف ہو جائے گا۔ تمام صارف ڈیٹا غائب ہو جائیں گے۔"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ڈیمو سے باہر نکلیں"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"برخاست کریں"</string>
     <string name="restricted_while_driving" msgid="6587569249519274524">"ڈرائیونگ کے دوران یہ خصوصیت دستیاب نہیں ہے"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 77cd4ab..b28e8bb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -311,7 +311,7 @@
     <string name="assistant_security_warning" msgid="1844807956967428012">"Trợ lý sẽ có thể đọc thông tin về ứng dụng mà bạn đang dùng trên hệ thống, bao gồm cả thông tin hiển thị trên màn hình hoặc thông tin có thể truy cập trong ứng dụng."</string>
     <string name="autofill_confirmation_message" msgid="1832984461556991378">"&lt;b&gt;Hãy đảm bảo bạn tin tưởng ứng dụng này&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; sử dụng nội dung trên màn hình của bạn để xác định nội dung nào có thể được tự động điền."</string>
     <string name="autofill_add_service" msgid="6413893366443609951">"Thêm dịch vụ"</string>
-    <string name="app_launch_domain_links_title" msgid="774480184927726651">"Mở đường dẫn liên kết"</string>
+    <string name="app_launch_domain_links_title" msgid="774480184927726651">"Mở đường liên kết"</string>
     <string name="domain_url_section_title" msgid="9070403140947787214">"Ứng dụng đã cài đặt"</string>
     <string name="domain_urls_summary_none" msgid="3077803215088293183">"Không mở các liên kết được hỗ trợ"</string>
     <string name="domain_urls_summary_one" msgid="5072257421806034237">"Mở <xliff:g id="DOMAIN">%s</xliff:g>"</string>
diff --git a/src/com/android/car/settings/system/LicenseHtmlLoader.java b/src/com/android/car/settings/system/LicenseHtmlLoader.java
index f77a44b..23e2a2a 100644
--- a/src/com/android/car/settings/system/LicenseHtmlLoader.java
+++ b/src/com/android/car/settings/system/LicenseHtmlLoader.java
@@ -35,7 +35,13 @@
             "/system/etc/NOTICE.xml.gz",
             "/vendor/etc/NOTICE.xml.gz",
             "/odm/etc/NOTICE.xml.gz",
-            "/oem/etc/NOTICE.xml.gz"};
+            "/oem/etc/NOTICE.xml.gz",
+            "/product/etc/NOTICE.xml.gz",
+            "/system_ext/etc/NOTICE.xml.gz",
+            "/vendor_dlkm/etc/NOTICE.xml.gz",
+            "/odm_dlkm/etc/NOTICE.xml.gz",
+    };
+
     private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
 
     private final Context mContext;
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 06301ff..4c91b4e 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -23,6 +23,7 @@
         "Robolectric_all-target",
         "robolectric_android-all-stub",
         "mockito-robolectric-prebuilt",
+        "telephony-common",
         "truth-prebuilt",
         "testng",
         "android.car",