Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Removes unnecessary permission from the EmergencyInfo app.

Change-Id: Ie97c4923d89f11de1f3babe9b6f192bc4e2096d6
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 7cc2c5b..f18abd9 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -26,7 +26,7 @@
     <string name="unknown_name" msgid="2834802479170495056">"Ezezaguna"</string>
     <string name="address" msgid="6449303483151189969">"Helbidea"</string>
     <string name="unknown_address" msgid="4212576729941786121">"Ezezaguna"</string>
-    <string name="date_of_birth" msgid="777979232444227891">"Jaioteguna"</string>
+    <string name="date_of_birth" msgid="777979232444227891">"Jaiotze-data"</string>
     <string name="unknown_date_of_birth" msgid="7416355536916066758">"Ezezaguna"</string>
     <string name="dob" msgid="2813161080307245706">"(<xliff:g id="DATE_OF_BIRTH">%1$s</xliff:g>)"</string>
     <string name="age" msgid="8327537794752630199">"Adina: <xliff:g id="NUMERICAL_AGE">%1$d</xliff:g>"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 63e2c92..bdaacad 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -96,7 +96,7 @@
     <string name="fail_add_contact" msgid="6511490846952942291">"Չհաջողվեց կարդալ կոնտակտային տվյալները"</string>
     <string name="remove" msgid="1243949503772376064">"Հեռացնել"</string>
     <string name="cancel" msgid="7401575239009060939">"Չեղարկել"</string>
-    <string name="ok" msgid="163967937451981024">"Հաստատել"</string>
+    <string name="ok" msgid="163967937451981024">"Եղավ"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Հեռախոսի սեփականատիրոջ մասին տեղեկություններ չկան"</string>
     <string name="tap_pencil" msgid="2723698054265296934">"Եթե սա ձեր հեռախոսն է, ապա հպեք մատիտի պատկերակին և ավելացրեք տեղեկություններ, որոնք կցուցադրվեն այստեղ արտակարգ իրավիճակի դեպքում"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 2e364a1..ad4de03 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -94,7 +94,7 @@
     <string name="remove_contact" msgid="6934983445723096759">"យក <xliff:g id="CONTACT_NAME">%1$s</xliff:g> ចេញពីទំនាក់ទំនងសង្គ្រោះបន្ទាន់ឬ?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"យក​ទំនាក់ទំនង​ចេញ"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"មិន​អាច​អាន​ព័ត៌មាន​ទំនាក់ទំនង​បាន​ត្រឹមត្រូវ​ទេ"</string>
-    <string name="remove" msgid="1243949503772376064">"យកចេញ"</string>
+    <string name="remove" msgid="1243949503772376064">"ដកចេញ"</string>
     <string name="cancel" msgid="7401575239009060939">"បោះបង់"</string>
     <string name="ok" msgid="163967937451981024">"យល់ព្រម"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 91fb675..d34fd3a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -89,7 +89,7 @@
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
     <string name="emergency_contacts_title" msgid="5462202017417821030">"Контакти за итни случаи"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Додај контакт"</string>
-    <string name="fail_load_contact_picker" msgid="817205483833876726">"Не можеше да се најде избирач на контакти"</string>
+    <string name="fail_load_contact_picker" msgid="817205483833876726">"Не може да се најде избирач на контакти"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Не може да се прикаже контактот"</string>
     <string name="remove_contact" msgid="6934983445723096759">"Да се отстрани <xliff:g id="CONTACT_NAME">%1$s</xliff:g> од контактите за итни случаи?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"Отстранете го контактот"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 5c9aec8..32ecc5f 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -16,10 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1090682794607161063">"आपतकालीन सूचना"</string>
+    <string name="app_label" msgid="1090682794607161063">"आपत्‌कालीन सूचना"</string>
     <string name="medical_info_title" msgid="3000192781136934887">"चिकित्सकीय जानकारी"</string>
     <string name="add_medical_info" msgid="483921612415907139">"जानकारी थप्नुहोस्"</string>
-    <string name="edit_info" msgid="5973929805855224805">"आपतकालीन जानकारीलाई सम्पादन गर्नुहोस्"</string>
+    <string name="edit_info" msgid="5973929805855224805">"आपत्‌कालीन जानकारीलाई सम्पादन गर्नुहोस्"</string>
     <string name="tab_title_info" msgid="1402033103294855812">"जानकारी"</string>
     <string name="tab_title_contacts" msgid="4298341166404791209">"सम्पर्कहरू"</string>
     <string name="name" msgid="4286267457738861977">"नाम"</string>
@@ -87,11 +87,11 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"आपतकालीन सम्पर्कहरू"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"आपत्‌कालीन सम्पर्कहरू"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"सम्पर्कलाई थप्नुहोस्"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"सम्पर्क ठेगानाहरूको चयनकर्ता भेट्टाउन सकिएन"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"उक्त सम्पर्क देखाउन सकिँदैन"</string>
-    <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> लाई आपतकालीन सम्पर्कहरूबाट हटाउने हो?"</string>
+    <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> लाई आपत्‌कालीन सम्पर्कहरूबाट हटाउने हो?"</string>
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"सम्पर्कलाई हटाउनुहोस्"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"सम्पर्कको जानकारी राम्ररी पढ्न सकिएन"</string>
     <string name="remove" msgid="1243949503772376064">"हटाउनुहोस्"</string>
@@ -99,15 +99,15 @@
     <string name="ok" msgid="163967937451981024">"ठिक छ"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"यस फोनको मालिक बारे कुनै जानकारी छैन"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"यदि यो तपाईँको फोन हो भने आपतकालीन अवस्थामा यहाँ प्रदर्शन गरिने जानकारी थप्न पेन्सिलको आइकनमा ट्याप गर्नुहोस्"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"यदि यो तपाईँको फोन हो भने आपत्‌कालीन अवस्थामा यहाँ प्रदर्शन गरिने जानकारी थप्न पेन्सिलको आइकनमा ट्याप गर्नुहोस्"</string>
     <string name="clear_all" msgid="8899013032870561633">"सबै हटाउनुहोस्"</string>
     <string name="clear" msgid="3648880442502887163">"खाली गर्नुहोस्"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"सबै जानकारी र सम्पर्कहरूलाई मेटाउने हो?"</string>
-    <string name="emergency_info_footer" msgid="8751758742506410146">"चिकित्सकीय जानकारी तथा आपतकालीन सम्पर्क नम्बरहरू थप्नुले कुनै आपतकालीन अवस्थामा पहिलो प्रतिक्रिया दिने व्यक्तिहरूलाई मद्दत गर्नसक्छ।\n\nतपाईंको लक स्क्रिनबाट जोसुकैले पनि यो जानकारी पढ्न र तपाईंको फोन अनलक नगरिकनै तपाईंको सम्पर्क सूचीमा रहेका व्यक्तिहरूलाई उनीहरूको नाममा ट्याप गरेर कल गर्नसक्छ।"</string>
-    <string name="settings_suggestion_title" msgid="2503369576806243476">"आपतकालीन जानकारी थप्नुहोस्‌"</string>
-    <string name="settings_suggestion_body" msgid="5559349261345837716">"तपाईंको जानकारी आपतकालीन अवस्थामा सहयोग पुर्‍याउने पहिला मान्छेहरूलाई हेर्न दिनुहोस्‌"</string>
-    <string name="user_image_take_photo" msgid="2779924488370750102">"तस्बिर खिच्नुहोस्"</string>
-    <string name="user_image_choose_photo" msgid="2442095378052415700">"कुनै तस्बिर छनौट गर्नुहोस्"</string>
-    <string name="user_image_photo_selector" msgid="8941966433899876760">"तस्बिर चयन गर्नुहोस्‌"</string>
+    <string name="emergency_info_footer" msgid="8751758742506410146">"चिकित्सकीय जानकारी तथा आपत्‌कालीन सम्पर्क नम्बरहरू थप्नुले कुनै आपत्‌कालीन अवस्थामा पहिलो प्रतिक्रिया दिने व्यक्तिहरूलाई मद्दत गर्नसक्छ।\n\nतपाईंको लक स्क्रिनबाट जोसुकैले पनि यो जानकारी पढ्न र तपाईंको फोन अनलक नगरिकनै तपाईंको सम्पर्क सूचीमा रहेका व्यक्तिहरूलाई उनीहरूको नाममा ट्याप गरेर कल गर्नसक्छ।"</string>
+    <string name="settings_suggestion_title" msgid="2503369576806243476">"आपत्‌कालीन जानकारी थप्नुहोस्‌"</string>
+    <string name="settings_suggestion_body" msgid="5559349261345837716">"तपाईंको जानकारी आपत्‌कालीन अवस्थामा सहयोग पुर्‍याउने पहिला मान्छेहरूलाई हेर्न दिनुहोस्‌"</string>
+    <string name="user_image_take_photo" msgid="2779924488370750102">"फोटो खिच्नुहोस्"</string>
+    <string name="user_image_choose_photo" msgid="2442095378052415700">"कुनै फोटो छनौट गर्नुहोस्"</string>
+    <string name="user_image_photo_selector" msgid="8941966433899876760">"फोटो चयन गर्नुहोस्‌"</string>
     <string name="user_nickname" msgid="7956055372443961161">"उपनाम"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3f001a3..920c83d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -99,7 +99,7 @@
     <string name="ok" msgid="163967937451981024">"OK"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"Geen informatie over de eigenaar van de telefoon"</string>
-    <string name="tap_pencil" msgid="2723698054265296934">"Als dit je telefoon is, tik je op het potloodpictogram om informatie toe te voegen die hier wordt weergegeven in geval van nood"</string>
+    <string name="tap_pencil" msgid="2723698054265296934">"Als dit je telefoon is, tik je op het potloodje om informatie toe te voegen die in geval van nood hier zichtbaar is"</string>
     <string name="clear_all" msgid="8899013032870561633">"Alles wissen"</string>
     <string name="clear" msgid="3648880442502887163">"Wissen"</string>
     <string name="clear_all_message" msgid="1548432000373861295">"Alle informatie en contacten wissen?"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f0d71c2..4ffce08 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -95,7 +95,7 @@
     <string name="remove_contact_icon_text" msgid="4576641386490101363">"ଯୋଗାଯୋଗକୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="fail_add_contact" msgid="6511490846952942291">"ଯୋଗାଯୋଗ ସୂଚନାକୁ ଠିକ୍ ଭାବେ ପଢ଼ି ହେଉନାହିଁ"</string>
     <string name="remove" msgid="1243949503772376064">"କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="cancel" msgid="7401575239009060939">"କ୍ୟାନ୍ସଲ୍‍"</string>
+    <string name="cancel" msgid="7401575239009060939">"ବାତିଲ୍‍"</string>
     <string name="ok" msgid="163967937451981024">"ଠିକ୍ ଅଛି"</string>
     <string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="no_info_provided" msgid="716200382010821001">"ଫୋନ୍ ମାଲିକଙ୍କର କିଛି ସୂଚନା ନାହିଁ"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e82c4a6..6b5b611 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -87,7 +87,7 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"Контакты для чрезвычайных ситуаций"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"Контакты для экстренных случаев"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"Добавить контакт"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Не удалось найти средство выбора контактов‏"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Не удалось показать контакт"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index b6369a2..e288fcf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -87,7 +87,7 @@
     <!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
-    <string name="emergency_contacts_title" msgid="5462202017417821030">"అత్యవసర పరిచయాలు"</string>
+    <string name="emergency_contacts_title" msgid="5462202017417821030">"ఎమర్జెన్సీ కాంటాక్టులు"</string>
     <string name="add_emergency_contact" msgid="4063577069613981029">"పరిచయాన్ని జోడించండి"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"పరిచయ పికర్ కనుగొనబడలేదు"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"పరిచయాన్ని ప్రదర్శించడం సాధ్యం కాదు"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index d878aa5..3146879 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -88,7 +88,7 @@
     <!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
     <!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
     <string name="emergency_contacts_title" msgid="5462202017417821030">"Favqulodda holatlar uchun kontaktlar"</string>
-    <string name="add_emergency_contact" msgid="4063577069613981029">"Kontakt saqlash"</string>
+    <string name="add_emergency_contact" msgid="4063577069613981029">"Kontaktni saqlash"</string>
     <string name="fail_load_contact_picker" msgid="817205483833876726">"Kontakt tanlash vositasini topib bo‘lmadi"</string>
     <string name="fail_display_contact" msgid="4128854688897045879">"Kontaktni ko‘rsatib bo‘lmadi"</string>
     <string name="remove_contact" msgid="6934983445723096759">"<xliff:g id="CONTACT_NAME">%1$s</xliff:g> favqulodda holatlar uchun kontaktlardan olib tashlansinmi?"</string>