Snap for 8589293 from 999467507f094e9b480c1c2b8da9a09fcd5ae712 to sc-v2-platform-releaseandroid-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10

Change-Id: I44ad0f58c8c73c80c8aac46ebc961135c3ec8679

13 files changed, 47 insertions, 45 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 32d6644a7..4c29039b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,8 +20,8 @@
           android:versionName="1.7.33">
 
     <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="30"/>
+        android:minSdkVersion="31"
+        android:targetSdkVersion="31"/>
 
     <original-package android:name="com.android.contacts"/>
 
@@ -572,7 +572,7 @@
         <activity
             android:name="com.android.contacts.dialog.CallSubjectDialog"
             android:theme="@style/Theme.CallSubjectDialogTheme"
-            android:exported="true"
+            android:exported="false"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b7bc19a16..e9dd4f929 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -179,7 +179,7 @@
     <string name="contact_directory_description" msgid="1773630547110881835">"الدليل <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"الإعدادات"</string>
     <string name="menu_settings" msgid="3524924670246877187">"الإعدادات"</string>
-    <string name="menu_help" msgid="287801702920372292">"المساعدة والتعليقات"</string>
+    <string name="menu_help" msgid="287801702920372292">"المساعدة والملاحظات"</string>
     <string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>
     <string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"رقم الهاتف"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1bff03d70..cb6316f7f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -507,7 +507,7 @@
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"Mostra\'n més"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"Importació de la targeta SIM completada"</string>
-    <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ha fallat la importació"</string>
+    <string name="importing_sim_failed_title" msgid="1046154274170241788">"La importació ha fallat"</string>
     <string name="importing_sim_failed_message" msgid="55568522164349044">"No s\'han pogut importar els contactes de la targeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"S\'estan important els contactes de la SIM"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notificacions"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a20d96e59..b9ac677f4 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -26,7 +26,7 @@
     <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Gehitu kontaktu batean"</string>
     <string name="contactPickerActivityTitle" msgid="1842634991247618890">"Aukeratu kontaktu bat"</string>
     <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"Hautatu"</string>
-    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Sortu kontaktua"</string>
+    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Sortu kontaktu bat"</string>
     <string name="searchHint" msgid="1487501532610025473">"Bilatu kontaktuetan"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"Gehitu gogokoetan"</string>
     <string name="menu_removeStar" msgid="3707373931808303701">"Kendu gogokoetatik"</string>
@@ -190,7 +190,7 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Hartu minutu pare bat Google-ko kontaktuen babeskopiak gordeko dituen kontu bat gehitzeko."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"<xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> kontuan gordeko dira kontaktu berriak."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Aukeratu kontaktu berriak gordetzeko erabili nahi duzun kontua:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Sortu kontaktua"</string>
+    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Sortu kontaktu bat"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Editatu kontaktua"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Ikusi soilik"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Aukeratu editatu beharreko kontaktua"</string>
@@ -200,7 +200,7 @@
     <string name="add_account" msgid="3071396624500839020">"Gehitu kontu bat"</string>
     <string name="add_new_account" msgid="573368229646104110">"Gehitu beste kontu bat"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"Esportatu datu-baseko fitxategiak"</string>
-    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Sortu kontaktua"</string>
+    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Sortu kontaktu bat"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Ikusi gehiago"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Ikusi gutxiago"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Honi buruz"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e3ae68054..037fbed84 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -66,16 +66,16 @@
     <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"<xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminati"</string>
     <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… eliminati"</string>
     <plurals name="contacts_deleted_toast" formatted="false" msgid="198534700386623765">
-      <item quantity="one">Contacts deleted</item>
       <item quantity="other">Contatti eliminati</item>
+      <item quantity="one">Contatto eliminato</item>
     </plurals>
     <plurals name="contacts_count" formatted="false" msgid="8804860300387044572">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> contacts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contatti</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contatto</item>
     </plurals>
     <plurals name="contacts_count_with_account" formatted="false" msgid="1025146902085751375">
-      <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contatti · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contatto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
     </plurals>
     <string name="title_from_google" msgid="2554633992366572820">"Di Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"Da <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -137,8 +137,8 @@
     <string name="menu_add_contact" msgid="5822356185421997656">"Aggiungi ai contatti"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Aggiungi"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
-      <item quantity="one">Share contacts via</item>
       <item quantity="other">Condividi contatti tramite</item>
+      <item quantity="one">Condividi contatto tramite</item>
     </plurals>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"Scegli account"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Crea etichetta"</string>
@@ -381,12 +381,12 @@
     <string name="import_from_sim" msgid="7825280799813847991">"Scheda SIM"</string>
     <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
     <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="8737770002554878728">
-      <item quantity="one">%1$d contacts</item>
       <item quantity="other">%1$d contatti</item>
+      <item quantity="one">1 contatto</item>
     </plurals>
     <plurals name="import_from_sim_secondary_template" formatted="false" msgid="6698670511061586532">
-      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> contacts • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> contatti • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contatto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
     </plurals>
     <string name="import_from_vcf_file" msgid="6776403212804361301">"File .vcf"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"Niente da importare"</string>
@@ -491,8 +491,8 @@
     <string name="sim_import_empty_message" msgid="7238368542566545854">"Nessun contatto presente nella SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"Contatto già esistente nell\'elenco"</string>
     <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="422539156156042210">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> SIM contacts imported</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contatti della SIM importati</item>
+      <item quantity="one">1 contatto della SIM importato</item>
     </plurals>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"Impossibile importare i contatti della SIM"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"Importa da SIM"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c67088662..ef92933b7 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -502,7 +502,7 @@
     <string name="account_sync_off" msgid="6187683798342006021">"खाता सिङ्क गर्ने सेवा निष्क्रिय छ। सक्रिय पार्न ट्याप गर्नुहोस्।"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"स्वत: सिंक सेवा सक्रिय गर्ने हो?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"तपाईंले Google सम्पर्कहरूमा मात्र नभई, सबै एप र खाताहरूमा गरेका परिवर्तनहरू वेब र तपाईंका अन्य यन्त्रहरूका बीचमा अद्यावधिक हुने छन्।"</string>
-    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"खोल्नुहोस्"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"अन गर्नुहोस्"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"जडान छैन"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"थप देखाउनुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2e8c8098e..1855aecc3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -398,7 +398,7 @@
     <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"Kan \'<xliff:g id="FILE_NAME">%1$s</xliff:g>\' niet openen: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Kan het exportprogramma niet starten: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Er is geen contact dat kan worden geëxporteerd."</string>
-    <string name="missing_required_permission" msgid="1308037728470791436">"Je hebt een vereist recht uitgeschakeld."</string>
+    <string name="missing_required_permission" msgid="1308037728470791436">"Je hebt een vereist recht uitgezet."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Er is een fout opgetreden tijdens het exporteren: \'<xliff:g id="EXACT_REASON">%s</xliff:g>\'."</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O-fout"</string>
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Onvoldoende geheugen. Het bestand is mogelijk te groot."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index b533a87ef..d2d09f6ec 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -345,7 +345,7 @@
     <string name="postal_country" msgid="6642804283917549861">"País"</string>
     <string name="map_home" msgid="2169053372466501148">"Ver endereço residencial"</string>
     <string name="map_work" msgid="8296916987749726461">"Ver endereço do trabalho"</string>
-    <string name="map_other" msgid="4009931029322619674">"Visualizar endereço"</string>
+    <string name="map_other" msgid="4009931029322619674">"Ver endereço"</string>
     <string name="map_custom" msgid="7797812861927817335">"Ver endereço de <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="chat_aim" msgid="2044861410748519265">"Bater papo usando o AIM"</string>
     <string name="chat_msn" msgid="4733206223124506247">"Bater papo usando o Windows Live"</string>
@@ -431,7 +431,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"Armazenando em cache"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar p/ arquivo .vcf"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Classificar por"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome fonético"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se vazio"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8bf1c354e..22539ba4b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -66,16 +66,16 @@
     <string name="contacts_deleted_two_named_toast" msgid="6908761620236434380">"Contactos <xliff:g id="NAME_0">%1$s</xliff:g> e <xliff:g id="NAME_1">%2$s</xliff:g> eliminados"</string>
     <string name="contacts_deleted_many_named_toast" msgid="4879197068250337298">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… foram eliminados"</string>
     <plurals name="contacts_deleted_toast" formatted="false" msgid="198534700386623765">
-      <item quantity="one">Contacto eliminado</item>
       <item quantity="other">Contactos eliminados</item>
+      <item quantity="one">Contacto eliminado</item>
     </plurals>
     <plurals name="contacts_count" formatted="false" msgid="8804860300387044572">
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> contactos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> contacto</item>
     </plurals>
     <plurals name="contacts_count_with_account" formatted="false" msgid="1025146902085751375">
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> contactos · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> contacto · <xliff:g id="ACCOUNT_1">%2$s</xliff:g></item>
     </plurals>
     <string name="title_from_google" msgid="2554633992366572820">"Da Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"Da conta <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
@@ -137,8 +137,8 @@
     <string name="menu_add_contact" msgid="5822356185421997656">"Adicionar aos contactos"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Adicionar"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
-      <item quantity="one">Partilhar contacto através de</item>
       <item quantity="other">Partilhar contactos através de</item>
+      <item quantity="one">Partilhar contacto através de</item>
     </plurals>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"Selecionar conta"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Criar etiqueta"</string>
@@ -381,12 +381,12 @@
     <string name="import_from_sim" msgid="7825280799813847991">"Cartão SIM"</string>
     <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
     <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="8737770002554878728">
-      <item quantity="one">1 contacto</item>
       <item quantity="other">%1$d contactos</item>
+      <item quantity="one">1 contacto</item>
     </plurals>
     <plurals name="import_from_sim_secondary_template" formatted="false" msgid="6698670511061586532">
-      <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> contactos • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> contacto • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
     </plurals>
     <string name="import_from_vcf_file" msgid="6776403212804361301">"Ficheiro .vcf"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"Nada para importar"</string>
@@ -491,8 +491,8 @@
     <string name="sim_import_empty_message" msgid="7238368542566545854">"Sem contactos no cartão SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"O contacto já existe na sua lista"</string>
     <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="422539156156042210">
-      <item quantity="one">1 contacto do cartão SIM importado</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> contactos do cartão SIM importados</item>
+      <item quantity="one">1 contacto do cartão SIM importado</item>
     </plurals>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"Ocorreu uma falha ao importar os contactos do cartão SIM"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"Importar do cartão SIM"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b533a87ef..d2d09f6ec 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -345,7 +345,7 @@
     <string name="postal_country" msgid="6642804283917549861">"País"</string>
     <string name="map_home" msgid="2169053372466501148">"Ver endereço residencial"</string>
     <string name="map_work" msgid="8296916987749726461">"Ver endereço do trabalho"</string>
-    <string name="map_other" msgid="4009931029322619674">"Visualizar endereço"</string>
+    <string name="map_other" msgid="4009931029322619674">"Ver endereço"</string>
     <string name="map_custom" msgid="7797812861927817335">"Ver endereço de <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="chat_aim" msgid="2044861410748519265">"Bater papo usando o AIM"</string>
     <string name="chat_msn" msgid="4733206223124506247">"Bater papo usando o Windows Live"</string>
@@ -431,7 +431,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"Armazenando em cache"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar p/ arquivo .vcf"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Classificar por"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome fonético"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se vazio"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index cdef0ec7f..f3c4308cc 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -133,12 +133,12 @@
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Shto një numër telefoni"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Shto një email"</string>
     <string name="missing_app" msgid="5674389915738964148">"Nuk u gjet asnjë aplikacion për të menaxhuar këtë veprim"</string>
-    <string name="menu_share" msgid="6343022811796001773">"Shpërnda"</string>
+    <string name="menu_share" msgid="6343022811796001773">"Shpërndaj"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"Shto te kontaktet"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Shto"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
-      <item quantity="other">Shpërnda kontaktet nëpërmjet</item>
-      <item quantity="one">Shpërnda kontaktin nëpërmjet</item>
+      <item quantity="other">Shpërndaj kontaktet nëpërmjet</item>
+      <item quantity="one">Shpërndaj kontaktin nëpërmjet</item>
     </plurals>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"Zgjidh llogarinë"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"Krijo etiketë"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 632eb1b61..194609cd7 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -35,7 +35,7 @@
     <string name="menu_editContact" msgid="5039663761025630208">"ఎడిట్"</string>
     <string name="menu_deleteContact" msgid="15161764025276217">"తొలగించు"</string>
     <string name="menu_change_photo" msgid="4911246106907208055">"ఫోటోను మార్చు"</string>
-    <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"షార్ట్‌కట్‌ను సృష్టించు"</string>
+    <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"షార్ట్‌కట్‌ను క్రియేట్ చేయండి"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"వేరు చేయి"</string>
     <string name="menu_editGroup" msgid="8706562583754054622">"కాంటాక్ట్‌లను తీసివేయండి"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"లేబుల్ పేరును మార్చు"</string>
@@ -44,7 +44,7 @@
     <string name="menu_selectForGroup" msgid="6386553337569514850">"కాంటాక్ట్‌లను ఎంచుకోండి"</string>
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"కాంటాక్ట్‌లను జోడించండి"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"లేబుల్ నుండి తీసివేయి"</string>
-    <string name="menu_new_group_action_bar" msgid="1670312283925872483">"లేబుల్‌ను సృష్టించు"</string>
+    <string name="menu_new_group_action_bar" msgid="1670312283925872483">"లేబుల్‌ను క్రియేట్ చేయండి"</string>
     <string name="splitConfirmation" msgid="4750158900636307469">"ఈ కాంటాక్ట్‌ను పలు కాంటాక్ట్‌లుగా అన్‌లింక్ చేయాలా?"</string>
     <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"వేరు చేయి"</string>
     <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"మీరు ఇప్పటికే చేసిన మార్పులను సేవ్ చేసి, ఈ కాంటాక్ట్‌ను పలు కాంటాక్ట్‌లుగా అన్‌లింక్ చేయాలనుకుంటున్నారా?"</string>
@@ -113,8 +113,8 @@
     <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"కాంటాక్ట్ ఫోటో మార్పులను సేవ్ చేయలేకపోయింది"</string>
     <string name="groupLoadErrorToast" msgid="4141488223976370583">"లేబుల్‌ను లోడ్ చేయడంలో విఫలమైంది"</string>
     <string name="groupDeletedToast" msgid="7774363940327847515">"లేబుల్ తొలగించబడింది"</string>
-    <string name="groupCreatedToast" msgid="1685148819468403239">"లేబుల్ సృష్టించబడింది"</string>
-    <string name="groupCreateFailedToast" msgid="1836425392831964024">"లేబుల్‌ను సృష్టించడం సాధ్యపడదు"</string>
+    <string name="groupCreatedToast" msgid="1685148819468403239">"లేబుల్ క్రియేట్ చేయబడింది"</string>
+    <string name="groupCreateFailedToast" msgid="1836425392831964024">"లేబుల్‌ను క్రియేట్ చేయడం సాధ్యపడదు"</string>
     <string name="groupUpdatedToast" msgid="3381549467345607379">"లేబుల్ నవీకరించబడింది"</string>
     <string name="groupMembersRemovedToast" msgid="8019566066934628011">"లేబుల్ నుండి తీసివేయబడ్డాయి"</string>
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"లేబుల్‌కు జోడించబడింది/జోడించబడ్డాయి"</string>
@@ -172,7 +172,7 @@
     <string name="date_year_toggle" msgid="8930759990426623823">"సంవత్సరాన్ని చేర్చు"</string>
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"ఖాతాను జోడించు"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"దిగుమతి చేయి"</string>
-    <string name="create_group_item_label" msgid="921929508079162463">"కొత్తది సృష్టించు…"</string>
+    <string name="create_group_item_label" msgid="921929508079162463">"కొత్తది క్రియేట్ చేయండి…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"\"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" లేబుల్‌ని తొలగించాలా? (కాంటాక్ట్‌లు వాటంతట అవే తొలగించబడవు.)"</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"మరొకదానితో లింక్ చేయడానికి ముందు కాంటాక్ట్ పేరు టైప్ చేయండి."</string>
     <string name="copy_text" msgid="6835250673373028909">"క్లిప్‌బోర్డ్‌కు కాపీ చేయి"</string>
@@ -190,7 +190,7 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"మీ కాంటాక్ట్‌లను Googleకు బ్యాకప్ చేసే ఖాతాను జోడించడానికి ఒక నిమిషం కేటాయించండి."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"కొత్త కాంటాక్ట్‌లు <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>కి సేవ్ చేయబడతాయి."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"కొత్త కాంటాక్టుల కోసం ఆటోమేటిక్ ఖాతాను ఎంచుకోండి:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"కొత్త పరి. సృష్టించు"</string>
+    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"కొత్త పరి. క్రియేట్ చేయండి"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"కాంటాక్ట్‌ ఎడిట్"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"వీక్షణ మాత్రమే"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"ఎడిట్ చేయాల్సిన కాంటాక్ట్‌ను ఎంచుకోండి"</string>
@@ -367,7 +367,7 @@
     <string name="announce_collapsed_fields" msgid="7611318715383228182">"కుదించబడింది"</string>
     <string name="list_filter_all_accounts" msgid="6173785387972096770">"అన్ని కాంటాక్ట్‌లు"</string>
     <string name="list_filter_all_starred" msgid="2582865760150432568">"నక్షత్రం గుర్తు ఉన్నవి"</string>
-    <string name="list_filter_customize" msgid="2368900508906139537">"అనుకూలీకరించు"</string>
+    <string name="list_filter_customize" msgid="2368900508906139537">"అనుకూలంగా మార్చండి"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"కాంటాక్ట్"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"అన్ని ఇతర కాంటాక్ట్‌లు"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"అన్ని కాంటాక్ట్‌లు"</string>
@@ -394,13 +394,13 @@
     <string name="cancel_import_confirmation_message" msgid="1007412828398265611">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క దిగుమతిని రద్దు చేయాలా?"</string>
     <string name="cancel_export_confirmation_message" msgid="370693160959236239">"<xliff:g id="FILENAME">%s</xliff:g> యొక్క ఎగుమతిని రద్దు చేయాలా?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"vCard దిగుమతి/ఎగుమతిని రద్దు చేయడం సాధ్యపడలేదు"</string>
-    <string name="fail_reason_unknown" msgid="3721044979355043778">"తెలియని లోపం."</string>
+    <string name="fail_reason_unknown" msgid="3721044979355043778">"తెలియని ఎర్రర్."</string>
     <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"ని తెరవడం సాధ్యపడలేదు: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"ఎక్స్‌పోర్టర్‌ను ప్రారంభించడం సాధ్యపడలేదు: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"ఎగమతి చేయగల కాంటాక్ట్ లేదు."</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"మీరు అవసరమైన అనుమతిని నిలిపివేసారు."</string>
-    <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"ఎగుమతి సమయంలో లోపం సంభవించింది: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
-    <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O లోపం"</string>
+    <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"ఎగుమతి సమయంలో ఎర్రర్ ఏర్పడింది: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
+    <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O ఎర్రర్"</string>
     <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"తగినంత మెమరీ లేదు. ఫైల్ చాలా పెద్దదిగా ఉండవచ్చు."</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"ఈ ఫార్మాట్‌కు సపోర్ట్‌ లేదు."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g>ని ఎగుమతి చేయడం పూర్తయింది."</string>
@@ -463,7 +463,7 @@
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"బ్లాక్ చేయబడిన నంబర్‌లు"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="SOURCE">%2$s</xliff:g> ద్వారా <xliff:g id="DATE">%1$s</xliff:g>"</string>
-    <string name="action_menu_back_from_search" msgid="683765774264585732">"శోధించడం ఆపివేస్తుంది"</string>
+    <string name="action_menu_back_from_search" msgid="683765774264585732">"సెర్చ్ చేయడం ఆపివేస్తుంది"</string>
     <string name="description_clear_search" msgid="1852934085825794095">"సెర్చ్‌ను క్లియర్ చేయండి"</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"ఖాతా"</string>
     <string name="set_default_account" msgid="9194321110211682396">"కాల్స్‌ల కోసం ఎప్పుడూ ఇది ఉపయోగించు"</string>
@@ -472,7 +472,7 @@
     <string name="send_and_call_button" msgid="4851257959568592699">"పంపు &amp; కాల్ చేయి"</string>
     <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
-    <string name="about_build_version" msgid="5870642814752351712">"బిల్డ్ సంస్కరణ"</string>
+    <string name="about_build_version" msgid="5870642814752351712">"బిల్డ్ వెర్షన్‌"</string>
     <string name="about_open_source_licenses" msgid="1617836621315557445">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ యొక్క లైసెన్స్ వివరాలు"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"గోప్యతా విధానం"</string>
diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java
index 4c7473107..f6703fc0d 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -15,6 +15,8 @@
  */
 package com.android.contacts;
 
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -196,7 +198,7 @@ public class SimImportService extends Service {
                 .setContentTitle(this.getString(R.string.importing_sim_finished_title))
                 .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(R.drawable.quantum_ic_done_vd_theme_24)
-                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
+                .setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE));
         return builder.build();
     }
 
@@ -210,7 +212,7 @@ public class SimImportService extends Service {
                 .setContentText(this.getString(R.string.importing_sim_failed_message))
                 .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(R.drawable.quantum_ic_error_vd_theme_24)
-                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));
+                .setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE));
         return builder.build();
     }