Merge "Show current screen lock as summary"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 125e90e..35e679d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -771,6 +771,8 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <activity android:name="Settings$AllApplicationsActivity"
@@ -784,6 +786,8 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -865,6 +869,8 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
@@ -886,6 +892,8 @@
                 android:value="com.android.settings.applications.ManageApplications" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
         <activity android:name="Settings$NotificationStationActivity"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 462f3d6..bfc523f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teks regstelling korrek klank vibreer outomaties taal gebaar stel voor voorstel tema aanstootlik woord emosiekoon internasionaal"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"terugstel voorkeure verstek"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"programme aflaai programme stelsel"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"programme toestemmings sekuriteit"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"gly wagwoord patroon pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Stel Wi-Fi-NFC-merker op"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Kies profiel"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Programtoestemmings"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme mag bykomende toegang hê"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme toegelaat"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 295dfc4..33660c2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"የጽሑፍ እርማት ትክክል ድምፅ ንዝረት ራስ-ሰር ቋንቋ የእጅ ምልክት ጠቁም ጥቆማ ገጽታ ጸያፍ ቃል ተይብ ስሜት ገላጭ ምስል አለምአቀፍ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"የምርጫዎች ነባሪን ዳግም አስጀምር"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"መተግበሪያዎች ውርድ መተግበሪያዎች ስርዓት"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"የመተግበሪያዎች ፈቃዶች ደህንነት"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ማንሸራተት የይለፍ ቃል ስርዓተ-ጥለት ፒን"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"የWi-Fi NFC መለያ ያዋቅሩ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"መገለጫ ይምረጡ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"የመተግበሪያ ፈቃዶች"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ተጨማሪ መዳረሻ ይፈቅዳሉ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ይፈቀዳል"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3fd4f8a..f1d869e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2426,6 +2426,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"نص تصحيح صحح صوت اهتزاز تلقائي لغة إيماءة اقتراح يقترح مظهر مسيء كلمة يكتب رمز تعبيري دولي"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"أمان أذونات التطبيقات"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"التمرير، كلمة المرور، النمط، رقم التعريف الشخصي"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة NFC عبر Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
@@ -2610,4 +2611,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
     <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
     <string name="choose_profile" msgid="8229363046053568878">"اختيار ملف شخصي"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"أذونات التطبيق"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"تم السماح بدخول إضافي لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"تم السماح لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e1319f7..8148b84 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"коригиране на текст коригиране звук вибриране автоматично език жест предлагане предложение тема обидна дума тип емотикони международно"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"нулиране, предпочитания, стандартни стойности"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"приложения, изтегляне, приложения, системни"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"плъзгане, парола, фигура, ПИН код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 0be91aa..22cbc0d 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"পাঠ্য সংশোধন সঠিক শব্দ স্পন্দন স্বয়ং ভাষা অঙ্গভঙ্গি প্রস্তাব প্রস্তাবনা থিম আপত্তিজনক শব্দ লেখা ইমোজি অন্তর্জাতিক"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"পছন্দগুলিকে ডিফল্ট অনুযায়ী পুনরায় সেট করুন"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"অ্যাপ্লিকেশানগুলি ডাউনলোড করার অ্যাপ্লিকেশান সিস্টেম"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"অ্যাপ্লিকেশান অনুমতিগুলির নিরাপত্তা"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"পাসওয়ার্ড প্যাটার্ন PIN স্লাইড করুন"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ট্যাগ সেটআপ করুন"</string>
     <string name="write_tag" msgid="8571858602896222537">"লিখুন"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
     <string name="choose_profile" msgid="8229363046053568878">"প্রোফাইল বেছে নিন"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশানের অনুমতি"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান অতিরিক্ত অ্যাক্সেস মঞ্জুরিপ্রাপ্ত"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান মঞ্জুরিপ্রাপ্ত"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 69ca220..6903352 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correcció corregir so vibració automàtic idioma gest suggerir suggeriment tema ofensiu paraula tipus emoji internacional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"restablir preferències predeterminades"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacions baixada aplicacions sistema"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"fer lliscar el dit, contrasenya, patró, PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Triar un perfil"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0140fd4..bf49f78 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"oprava textu opravit zvuk vibrace automatický výběr jazyka návrh navrhování motiv nevhodné slovo psaní emodži mezinárodní"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"resetovat předvolby výchozí"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikace stahování systém"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikace oprávnění zabezpečení"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"přejetí prstem heslo gesto pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Vyberte profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Oprávnění aplikace"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Další přístup povolen u <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povoleno u <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 92a5abd..2fcca77 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst korrektion korriger lyd vibrer auto sprog bevægelse foreslå forslag tema stødende ord type emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"nulstilling af præferencer til standard"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"system til download af applikationer"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"stryg adgangskode mønster pinkode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Vælg profil"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1cd6044..26a414a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2391,6 +2391,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text korrektur textkorrektur korrigieren sound ton vibrieren automatisch sprache bewegung vorschlagen vorschlag design anstößig anstößiges wort eingeben emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"Standardeinstellung für das Zurücksetzen"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"App-System für App-Download"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"App-Berechtigungen – Sicherheit"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ziehen passwort muster pin slide password pattern"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
@@ -2563,4 +2564,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil auswählen"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App-Berechtigungen"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps haben zusätzliche Zugriffsrechte."</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps sind berechtigt."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 98864f0..674a63b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2392,6 +2392,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"διόρθωση κειμένου διόρθωση ήχου δόνηση αυτόματο γλώσσα κίνηση προτείνω πρόταση θέμα προσβλητικό λέξη τύπος emoticon διεθνές"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"επαναφορά προεπιλεγμένων προτιμήσεων"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"εφαρμογές λήψη εφαρμογές σύστημα"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ασφάλεια δικαιωμάτων εφαρμογών"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ολίσθηση κωδικός πρόσβασης μοτίβο pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
@@ -2564,4 +2565,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Επιλογή προφίλ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Δικαιώματα εφαρμογών"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Επιτρέπεται επιπλέον πρόσβαση σε <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμ."</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Επιτρέπονται <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμογές"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 5f33309..cb83480 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5f33309..cb83480 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 5f33309..cb83480 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"reset preferences default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Set up Wi-Fi NFC Tag"</string>
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6922939..c904f37 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección de texto, corregir, sonido, vibrar, automático, idioma, gesto, sugerir, sugerencia, tema, palabra ofensiva, tipo, emoji, internacional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer, preferencias, predeterminadas"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicaciones, descarga, aplicaciones, sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2560,4 +2561,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Elegir perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplic. con permiso de acceso adicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4252f7d..3d960db 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corrección texto, corregir, sonido, vibración automática, idioma, gesto, sugerencia, tema, palabra ofensiva, escribir, emoji, internacional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer preferencias predeterminadas"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicación, descargar, aplicaciones, sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguridad de permisos de aplicaciones"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar, contraseña, patrón, pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Más acceso permitido a <xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 527abcc..e276369 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekstiparandus paranda heli vibreeri automaatne keel liigutus soovita soovitus teema solvav sõna tüüp emotikon rahvusvaheline"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"lähtestamine eelistused vaikeseade"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"rakendused allalaadimine rakendus süsteem"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lohistamine parool muster PIN-kood"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WiFi NFC-kiibi seadistamine"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profiili valimine"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 105d7f0..4a95f03 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"testua, zuzenketa, zuzendu, soinua, dardara, automatikoa, hizkuntza, keinua, iradoki, iradokizuna, gaia, iraingarria, hitza, mota, emotikonoa, nazioartekoa"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"berrezarri hobespenak lehenetsia"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikazioak deskargatu aplikazioa sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikazioak baimenak segurtasuna"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"lerratu pasahitz eredu pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfiguratu Wi-Fi NFC etiketa"</string>
     <string name="write_tag" msgid="8571858602896222537">"Idatzi"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Aukeratu profila"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Aplikaziorako baimenak"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikaziok sarbide gehigarria dute"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikazio baimenduta"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2ab5542..b5f5ad2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"تصحیح نوشتار تصحیح صدا لرزش خودکار زبان اشاره پیشنهاد دادن پیشنهاد طرح زمینه کلمه توهین‌آمیز نوع ایموجی بین‌المللی"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"بازنشانی پیش‌فرض تنظیمات ترجیحی"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"برنامه‌ها دانلود برنامه‌ها سیستم"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"امنیت مجوزهای برنامه‌ها"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"لغزاندن گذرواژه الگو پین"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب NFC برای Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
     <string name="choose_profile" msgid="8229363046053568878">"انتخاب نمایه"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"مجوزهای برنامه"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه اجازه دسترسی اضافی دارد"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه مجاز است"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e2a4438..da2c375 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksti korjaus korjaa ääni värinä automaattinen kieli ele ehdottaa ehdotus teema loukkaava sana kirjoita emoji kansainvälinen"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"nollaa asetukset oletus"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"sovellukset lataus järjestelmä"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"liu\'uta salasana lukituksenpoistokuvio PIN-koodi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tagi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Valitse profiili"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b9d4337..cd19381 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correction de texte corriger son vibreur automatique langue geste suggérer suggestion thème choquant type de mot emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"réinitialiser préférences par défaut"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"applis télécharger applications système"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"applications autorisations sécurité"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisser mot de passe schéma nip"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Sélectionnez un profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorisations de l\'application"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 05d631a..244d3d7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correction de texte corriger son vibreur automatique langue geste suggérer suggestion thème choquant type de mot emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"réinitialiser préférences valeur par défaut"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"applis télécharger applications système"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sécurité des autorisations des applications"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"faire glisser mot de passe schéma code d\'accès"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Sélectionner un profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorisations des applications"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 7a4732e..64d1015 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"texto corrección correcto son vibrar automático idioma xesto suxerir suxestión tema palabra ofensiva escribir emoji internacional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"restablecer preferencias predeterminadas"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicacións descarga aplicacións sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"seguranza dos permisos das aplicacións"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"pasar o dedo contrasinal padrón pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC wifi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicacións"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso de acceso adicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 98e2383..6a058f1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"रीसेट करें प्राथमिकता डिफ़ॉल्‍ट"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ऐप्‍स डाउनलोड ऐप्‍लिकेशन सिस्‍टम"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ऐप्स अनुमति सुरक्षा"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"स्लाइड पासवर्ड प्रतिमान पिन"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
     <string name="choose_profile" msgid="8229363046053568878">"प्रोफ़ाइल चुनें"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ऐप अनुमतियां"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अतिरिक्त एक्सेस की अनुमति है"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अनुमति है"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d81ed85..e379ae6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2399,6 +2399,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ispravak teksta ispraviti zvuk vibracija automatski jezik pokret predložiti prijedlog tema uvredljivo riječ upisivati emoji međunarodno"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"poništavanje vraćanje na zadano postavke zadano"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije preuzimanje sustav"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikacije dopuštenja sigurnost"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kliziti zaporka uzorak PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
@@ -2574,4 +2575,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Odabir profila"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Dopuštenja aplikacije"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Broj aplikacija s dodatnim pristupom: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Broj aplikacija s dopuštenjem: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 23c07b6..75b5067 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"szövegjavítás javítás hang rezgés automatikus nyelv kézmozdulat javasol javaslat téma trágár szó gépel hangulatjel nemzetközi"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"visszaállítás beállítások alapértelmezett érték"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"alkalmazás letöltés alkalmazások rendszer"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"alkalmazások engedélyek biztonság"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"csúsztatás jelszó minta pin kód"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC-címke beállítása"</string>
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil kiválasztása"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Alkalmazásengedélyek"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazásnál van további hozzáférés"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazás engedélyezve"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 2c70cdc..3adab8d 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1109,8 +1109,8 @@
     <string name="location_mode_high_accuracy_description" msgid="5349014493087338351">"Օգտագործել GPS, Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_mode_battery_saving_description" msgid="7581657383062066461">"Օգտագործել Wi-Fi և բջջային ցանցերը՝ դիրքը տեղորոշելու համար"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղադրությունը որոշելու համար օգտագործել GPS-ը"</string>
-    <string name="location_menu_scanning" msgid="8536245838478802959">"Սկանավորում"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Սկանավորում"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Վերլուծում"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Վերլուծում"</string>
     <string name="location_network_based" msgid="6010456018401296590">"Wi‑Fi և բջջային ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Տեղադրությունը որոշված է Wi‑Fi-ի կողմից"</string>
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"տեքստի ուղղում ուղղել ձայն թրթռալ ավտոմատ լեզու ժեստ առաջարկել առաջարկ թեմա վիրավորական բառ մուտքագրել զմայլիկ միջազգային"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"վերակայել կանխադրված նախընտրանքները"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"հավելվածներ ներբեռնել հավելվածներ համակարգ"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"սահեցնել գաղտնաբառ նախշ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել Wi-Fi NFC պիտակը"</string>
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d9fafd7..4905bf0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teks koreksi benar suara getar otomatis bahasa isyarat sarankan saran tema menyinggung kata jenis emoji internasional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"setel ulang preferensi default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apl unduh aplikasi sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikasi izin keamanan"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"geser pin pola sandi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Siapkan Tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Izin aplikasi"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> diizinkan akses tambahan"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 1995da4..574cf98 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"texti leiðrétting leiðrétta hljóð titringur sjálfvirkt tungumál bending stinga upp á tillaga þema móðgandi orð skrifa emoji alþjóðlegt"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"endurstilla stillingar sjálfgildi"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"forrit sækja niðurhal kerfi"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"öryggi forritsheimilda"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"renna aðgangsorð mynstur pin-númer"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setja upp Wi-Fi NFC-merki"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skrifa"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Veldu snið"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Heimildir forrits"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum veittur frekari aðgangur"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum leyfð"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3edcf01..2aed951 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correzione del testo correggere suono vibrazione lingua automatica gesto suggerire suggerimento tema digitazione parole offensive emoji internazionale"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ripristino preferenze predefinite"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"download app applicazioni sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sicurezza delle autorizzazioni app"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"scorrimento password sequenza pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Scegli profilo"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorizzazioni app"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"A <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> è stato autorizzato un ulteriore accesso"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Sono consentite <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2278574..3f55357 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"תיקון טקסט תקן צליל רטט אוטומטי שפה תנועה הצע הצעה עיצוב מילה פוגענית הקלד אמוג\'י בינלאומי"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"איפוס לברירת המחדל של העדפות"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"מערכת לבקשה של הורדת אפליקציות"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"אבטחה של הרשאות לאפליקציות"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏החלקה סיסמה קו ביטול נעילה מספר PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג NFC של Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
     <string name="choose_profile" msgid="8229363046053568878">"בחר פרופיל"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"הרשאות לאפליקציות"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו גישה נוספת"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו הרשאה"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 26cee9a..512a689 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2396,6 +2396,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"テキスト 補正 修正 音 バイブレーション 自動 言語 ジェスチャー 候補 テーマ 不適切 語 入力 絵文字 国際"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"リセット 設定 既定"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"アプリ ダウンロード アプリ システム"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"アプリ 権限 セキュリティ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"スライド パスワード パターン pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFCタグのセットアップ"</string>
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
@@ -2568,4 +2569,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"プロフィールの選択"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"アプリの権限"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリに追加アクセスを許可"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリを許可"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 8df50fc..feb16ed 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ტექსტის კორექცია შესწორება ხმა ვიბრაცია ავტო ენა ჟესტი შეთავაზება თემა შეურაცხმყოფელი სიტყვა აკრეფა emoji საერთაშორისო"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"გადაყენება პარამეტრები ნაგულისხმევი"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"აპები ჩამოტვირთვა აპლიკაციები სისტემა"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"გასრიალება პაროლი ნიმუში pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC თეგის დაყენება"</string>
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
     <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
     <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 2664bb9..265a0d1 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"мәтінді түзету түзету дыбыс дірілдету авто тіл қимыл ұсыну ұсыныс тақырып тіл тигізетін сөз түрі эмодзи халықаралық"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"әдепкі параметрлерді қалпына келтіру"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"қолданбаларды жүктеу қолданбалар жүйесі"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырғыту құпия сөз өрнек PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC белгісін реттеу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазу"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 32d4930..79a3132 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ការ​កែ​អត្ថបទ កែ សំឡេង ញ័រ ស្វ័យប្រវត្តិ ភាសា កាយវិការ ស្នើ ការ​ស្នើ រូបរាង បំពាន ពាក្យ វាយ​បញ្ចូល សញ្ញា​អារម្មណ៍ អន្តរជាតិ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"កំណត់លំនាំដើមចំណូលចិត្តឡើងវិញ"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"កម្មវិធីទាញយកប្រព័ន្ធកម្មវិធី"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"រុញ​ពាក្យសម្ងាត់ លំនាំ កូដ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 22bc66f..2558921 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ಪಠ್ಯ ತಿದ್ದುಪಡಿ ಸರಿಪಡಿಸು ಶಬ್ದ ವೈಬ್ರೇಟ್ ಸ್ವಯಂ ಭಾಷೆ ಸನ್ನೆ ಸಲಹೆ ನೀಡಿ ಸಲಹೆ ಥೀಮ್ ಆಕ್ರಮಣಕಾರಿ ಶಬ್ದ ಪ್ರಕಾರ ಎಮೊಜಿ ಅಂತರರಾಷ್ಟ್ರೀಯ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ಮರುಹೊಂದಿಸಿ ಆದ್ಯತೆಗಳು ಡೀಫಾಲ್ಟ್"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಡೌನ್‌ಲೋಡ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಿಸ್ಟಮ್"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅನುಮತಿಗಳು ಭದ್ರತೆ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ಸ್ಲೈಡ್ ಪಾಸ್‌ವರ್ಡ್ ಮಾದರಿ ಪಿನ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ಅಜ್ಞಾತ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಗಳು"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿ. ಹೆಚ್ಚುವರಿ ಪ್ರವೇಶ ಅನುಮತಿಸಲಾಗಿದೆ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8a64906..6bcb8a8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"텍스트 수정 수정 사운드 진동 자동 언어 제스처 추천하기 추천 테마 불쾌감을 주는 단어 유형 그림 이모티콘 전 세계"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"환경설정 기본값 초기화"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"앱 다운로드 애플리케이션 시스템"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"슬라이드 비밀번호 패턴 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC 태그 설정"</string>
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
@@ -2499,7 +2501,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"사용"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"사용 안함"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"화면 고정"</string>
-    <string name="screen_pinning_description" msgid="1137904524037468263">"이 설정이 사용 설정되어 있는 경우 화면 고정을 사용하여 고정 해제하기 전까지 현재 화면을 계속 표시할 수 있습니다.\n\n화면 고정을 사용하려면 다음 단계를 따르세요.\n\n1. 화면 고정을 사용하도록 설정했는지 확인합니다.\n\n2. 고정하려는 화면을 엽니다.\n\n3. 개요를 터치합니다.\n\n4. 위로 스와이프한 다음 핀 아이콘을 터치합니다."</string>
+    <string name="screen_pinning_description" msgid="1137904524037468263">"이 설정이 사용 설정되어 있는 경우 화면 고정을 사용하여 고정 해제하기 전까지 현재 화면을 계속 표시할 수 있습니다.\n\n화면 고정을 사용하려면 다음 단계를 따르세요.\n\n1. 화면 고정을 사용하도록 설정했는지 확인합니다.\n\n2. 고정하려는 화면을 엽니다.\n\n3. 최근 사용을 터치합니다.\n\n4. 위로 스와이프한 다음 핀 아이콘을 터치합니다."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"고정 해제 이전에 잠금해제 패턴 요청"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"고정 해제 이전에 PIN 요청"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"고정 해제 이전에 비밀번호 요청"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
     <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
     <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index d61dee1..81366a7 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -3263,6 +3263,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст тууралоо туура добуш дирилдөө авт тил жаңсоо сунуштоо сунуш тема адепсиз сөз түрү эмодзи эларалык"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"демейки жеке жөндөөлөрдү баштапкы абалга келтирүү"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"колдонмолор колдонмо тутумун жүктөп алат"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"сырсөз үлгү төөнөгүчүн жылмыштыруу"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC тегин орнотуу"</string>
     <string name="write_tag" msgid="8571858602896222537">"Жазуу"</string>
@@ -3437,4 +3439,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 0ac1ecb..ea3edcf 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"​ແກ້​ໄຂ ຂໍ້​ຄວາມ ແກ້​ໄຂ ສຽງ ສັ່ນ​ເຕືອນ ອັດ​ຕະ​ໂນ​ມັດ ພາ​ສາ ແນະ​ນຳ ການ​ແນະ​ນຳ ຮູບ​ແບບ​ສີ​ສັນ ຄຳ ຫຍາບ​ຄາຍ ປະ​ເພດ ອີ​ໂມ​ຈິ ສາ​ກົນ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ຕັ້ງ​ການ​ຕັ້ງ​ຄ່າ​ມາດ​ຕະ​ຖານ​ຄວາມ​ມັກ​ໃໝ່"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ດາວ​ໂຫຼດ​ແອັບ ລະ​ບົບ​ແອັບ​ພ​ລິ​ເຄ​ຊັນ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ຄວາມ​ປອດ​ໄພ​ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ສະ​ໄລ້ ລະ​ຫັດ​ຜ່ານ ຮູບ​ແບບ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ເລືອກ​ໂປ​ຣ​ໄຟ​ລ໌"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ການ​ເຂົ້າ​ຫາ​ເພີ່ມ​ເຕີມ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ແລ້ວ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2cf3ed0..a94503a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksto pataisymas pataisyti garsas vibruoti automatinis kalba gestas pasiūlyti pasiūlymas tema įžeidžiantis žodis tipas jaustukai tarptautinis"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"nustatyti iš naujo nuostatos numatytosios"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"programos atsisiųsti programos sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"programų leidimų sauga"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slysti slaptažodis šablonas PIN kodas"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nustatyti „Wi-Fi“ ALR žymą"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profilio pasirinkimas"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Programos leidimai"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Leidžiama papildoma programų prieiga: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Leidžiama programų: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 220e0b6..68d2283 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2399,6 +2399,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"teksts labojums labot skaņa vibrācija automātisks valoda žests ieteikt ieteikums motīvs aizvainojošs vārds rakstīt emocijzīmes starptautisks"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"atiestatīt preferences noklusējums"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"lietotnes lejupielādēt lietojumprogrammas sistēma"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vilkt parole kombinācija pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi NFC atzīmi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
@@ -2574,4 +2576,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profila izvēlēšanās"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 4c792e3..5235b91 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст поправка поправи звук вибрирај автоматски јазик движење предложи предлог тема навредлив збор впиши емотикона меѓународно"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ресетирање претпочитања стандардни"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"апликации преземање систем"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"лизгај лозинка шема ПИН"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Поставете Wi-Fi ознака за НФЦ"</string>
     <string name="write_tag" msgid="8571858602896222537">"Пишувај"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 049a2f5..3cdbba9 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ടെക്‌സ്‌റ്റ് തിരുത്തൽ തിരുത്തുക ശബ്‌ദം വൈബ്രേറ്റുചെയ്യുക സ്വയമേവയുള്ള ഭഷ സവിശേഷത നിർദ്ദേശിക്കുക നിർദ്ദേശം തീം കുറ്റകരമായ പദം ടൈപ്പുചെയ്യൽ ഇമോജി അന്തർദ്ദേശീയം"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"മുൻഗണനകളെ സ്ഥിരമെന്ന് റീസെറ്റുചെയ്യുക"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ആപ്സ് ഡൗൺലോഡ് അപ്ലിക്കേഷൻ സിസ്റ്റം"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"അപ്ലിക്കേഷൻ അനുമതി സുരക്ഷ"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"പാസ്‌വേഡ് പാറ്റേൺ പിൻ സ്ലൈഡുചെയ്യുക"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
     <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"അപ്ലിക്കേഷൻ അനുമതികൾ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾക്ക് കൂടുതൽ ആക്‌സസ്സ് അനുവദിച്ചിരിക്കുന്നു"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾ അനുവദനീയം"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 640e655..ca3d03b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -2380,6 +2380,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"Текст залруулах дууг залруулах чичиргээ авто хэл дохио зөвлөх дэвсгэр доромжилсон үг бичих дүрс олон улс"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"Эрхэмлэх тохиргоог анхны хэлбэрт оруулах"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"апп, апп татах, систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апп-уудын зөвшөөрлийн аюулгүй байдал"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"слайд нууц үг хээ пин"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
@@ -2548,4 +2549,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Профайлаа сонгоно уу"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Апп зөвшөөрөл"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>-аас<xliff:g id="COUNT_1">%d</xliff:g> апп-уудад нэмэлтээр нэвтрэхийг зөвшөөрсөн"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>-аас <xliff:g id="COUNT_1">%d</xliff:g> апп зөвшөөрөгдсөн"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 368437c..f4b2011 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"मजकूर सुधारणा योग्य ध्वनी कंपन स्वयं भाषा जेश्चर सुचवा सूचना थीम आक्षेपार्ह शब्द प्रकार इमोजी आंतरराष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"प्राधान्ये डीफॉल्‍ट रीसेट करा"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"अॅप्स डाउनलोड अनुप्रयोग सिस्टीम"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"अॅप्स परवानग्या सुरक्षितता"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"संकेतशब्द नमुना पिन स्लाइड करा"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
     <string name="choose_profile" msgid="8229363046053568878">"प्रोफाईल निवडा"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"अॅप परवानग्या"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अतिरिक्त प्रवेशाची अनुमती आहे"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अनुमती आहे"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a447986..6f43bbe 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"pembetulan teks betul bunyi getaran auto bahasa gerak isyarat cadang cadangan tema perkataan mengganggu taip emoji antarabangsa"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"tetapan semula pilihan lalai"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"app muat turun aplikasi sistem"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"luncur kata laluan corak pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 3def204..c20ce3c 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -2391,6 +2391,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"စာတို အမှားပြင်ဆင်ခြင်း အမှန် အသံ တုန်ခါခြင်း အလိုအလျောက် ဘာသာစကား အမူအရာ အကြံပေး အကြံပြုခြင်း ပုံစံ ထိခိုက်နစ်နာစေသော စကားလုံး စာရိုက် အီမိုဂျီရုပ်ပုံ အပြည်ပြည်ဆိုင်ရာ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ရွေးချယ်စရာများအား မူလအတိုင်း ပြန်ညှိရန်"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"app များ ဒေါင်းလုပ်ရယူသော အပ္ပလီကေးရှင်းစနစ်"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"အပ်ဖ်များ ခွင့်ပြုချက်လုံခြုံရေး"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"စကားဝှက် ပုံစံ ပင်ကို ရွှေ့ရန်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
@@ -2563,4 +2564,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
     <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အပလီကေးရှင်း"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ပရိုဖိုင်ရွေးရန်"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App ခွင့်ပြုချက်များ"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များနောက်ထပ် အသုံးပြုမှုများ ခွင့်ပြုထား"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များ ခွင့်ပြုထား"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1e4c76c..d3814dd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sende melding korrigering korrekt lyd vibrer automatisk språk bevegelse foreslå forslag tema støtende ord type emoji internasjonal"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"tilbakestill innstillinger standard"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apper last ned apper system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sikkerhet for apptillatelser"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra passord mønster PIN-kode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Konfigurer NFC-tag for Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Velg profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Apptillatelser"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper har ytterligere tilgang"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper er tillatt"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index f0f81ed..51e9f76 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -1445,12 +1445,12 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"नक्कली स्थानहरूलाई अनुमति दिनुहोस्"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"दृष्टिकोण विशेषता निरीक्षण सक्षम पार्नुहोस्"</string>
-    <string name="debug_networking_category" msgid="7044075693643009662">"सञ्जाल निर्माण"</string>
+    <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किङ"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ताररहित प्रदर्शन प्रमाणीकरण"</string>
     <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाइफाइ वर्बोज लग सक्षम पार्नुहोस्"</string>
     <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेलुलर समायोजनका लागि आक्रामक वाइफाइ"</string>
     <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"वाइफाइ घुम्ने स्क्यान गर्न सधैँ अनुमति दिनुहोस्"</string>
-    <string name="legacy_dhcp_client" msgid="694426978909127287">"पैतृक DHCP ग्राहक प्रयोग गर्नुहोस्"</string>
+    <string name="legacy_dhcp_client" msgid="694426978909127287">"लिगेसी DHCP ग्राहक प्रयोग गर्नुहोस्"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ताररहित प्रदर्शन प्रमाणीकरणका लागि विकल्पहरू देखाउनुहोस्"</string>
     <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाइफाइ लग स्तर बढाउनुहोस्, वाइफाइ चयनकर्तामा प्रति SSID RSSI देखाइन्छ"</string>
     <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"वाइफाइ संकेत कम हुँदा, सक्षम जब गरिन्छ, वाइफाइ सेलुलर लागि डेटा जडान सुम्पनामा बढी आक्रामक हुनेछ"</string>
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"पाठ सुधार सही ध्वनि कम्पन स्वतः भाषा इशारा सुझाव दिनु सुझाव विषय आपत्तिजनक शब्द प्रकार इमोजी अन्तर्राष्ट्रिय"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"प्राथमिकताहरू पूर्वनिर्धारित रिसेट गर्नुहोस्"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"अनुप्रयोगहरू डाउनलोड गर्ने अनुप्रयोग प्रणाली"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"अनुप्रयोगहरू अनुमति सुरक्षा"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"पासवर्ड प्याटर्न पिन स्लाइड गर्नुहोस्"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ट्याग सेट गर्नुहोस्"</string>
     <string name="write_tag" msgid="8571858602896222537">"लेख्नुहोस्"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
     <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"अनुप्रयोग अनुमतिहरू"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई थप पहुँच अनुमति छ"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई अनुमति छ"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index aa279da..a8609fa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst correctie corrigeren geluid trillen automatisch taal gebaar voorstellen suggestie thema aanstootgevend woord type emoji internationaal"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"herstellen voorkeuren standaard"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps downloaden applicaties systeem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps rechten beveiliging"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"vegen wachtwoord patroon pincode"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag instellen"</string>
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profiel kiezen"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"App-rechten"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Extra toegang verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0447c47..92786ea 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"tekst poprawianie popraw dźwięk wibracje automatyczne język gest sugeruj sugestia motyw obraźliwe słowo typ emoji międzynarodowe"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"resetuj ustawienia domyślne"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacje pobrane systemowe"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpieczenia uprawnień aplikacji"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"przesuwanie hasło wzór pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Skonfiguruj tag NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Wybierz profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Uprawnienia aplikacji"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Dodatkowy dostęp dozwolony dla <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dozwolone: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e51bf12..d18d7d5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correção de texto corrigir som vibração idioma automático toque sugerir sugestão tema palavra ofensiva escrever emoji internacional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"repor preferências predefinição"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicações transferência sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicações autorizações segurança"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar lentamente palavra-passe sequência pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Autorizações da aplicação"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas com acesso adic."</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c92a901..71eda8d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"correção de texto corrigir som vibrar idioma automático gesto sugerir tema palavra ofensiva digitar emoji internacional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"redefinir preferências padrão"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"apps download aplicativos sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"segurança das permissões de apps"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"deslizar senha padrão pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permissões do app"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps receberam acesso adicional"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps permitidos"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ff78b04..35a9f2d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2400,6 +2400,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"corectarea textului corectați sunet vibrații auto limbă gest sugera sugestie temă cuvânt ofensator introducere de text emoji internațional"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"resetați preferințe valori prestabilite"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplicații descărcați sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplicații permisiuni securitate"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"glisare parolă model PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
@@ -2575,4 +2576,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Alegeți un profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Permisiuni pentru aplicație"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> (de) aplicații cu acces suplimentar"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> (de) aplicații au această permisiune"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 632aeab..9ad66bd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2408,6 +2408,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправление автокоррекция звук вибрация авто язык жест подсказка тема неприемлемый слово ввод эмодзи смайлик интернациональный"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"сброс настройки по умолчанию"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"приложения скачать установить система"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем по экрану пароль графический ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
@@ -2586,4 +2588,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 3f3a24b..9d6cf8f 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -2392,6 +2392,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"පෙළ නිවැරදි කිරීම ශබ්ද නිවැරදි කරන්න කම්පනය වන්න ස්වයං භාෂා ඉංගිතය යෝජනා කරන්න යෝජනා කළ තේමා අහිතකර වචන ඉමොජි වර්ග අන්තර්ජාතික"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"සුපුරුදු මනාප යළි පිහිටුවන්න"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"යෙදුම් බාගැනීම යෙදුම් පද්ධති"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"යෙදුම් අවසර ආරක්ෂාව"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"සර්පණය මුරපදය රටාව pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ටැගයක් ස්ථාපනය කරන්න"</string>
     <string name="write_tag" msgid="8571858602896222537">"ලියනවා"</string>
@@ -2564,4 +2565,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
     <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
     <string name="choose_profile" msgid="8229363046053568878">"පැතිකඩ තෝරන්න"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"යෙදුම් අවසර"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> කින් <xliff:g id="COUNT_0">%d</xliff:g> කට අමතර ප්‍රවේශය ඉඩ දෙන ලදී"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> න් <xliff:g id="COUNT_0">%d</xliff:g> කට ඉඩ දෙන ලදී"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 070eee1..cd8752c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"oprava textu opraviť zvuk vibrácie automatický výber jazyka návrh navrhovanie motív nevhodné slovo písanie emodži medzinárodné"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"obnoviť predvolené hodnoty"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplik. sťahovanie aplikácie systémové"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpečenie povolení aplikácií"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"prejsť prstom heslo vzor pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie značky NFC (Wi-Fi)"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Výber profilu"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Povolenia aplikácie"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Povolené aplikácie s dodat. prístupom: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povolené aplikácie: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a0460a0..227d9e4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"popravljanje besedila pravilno zvok vibriranje samodejno jezik poteza predlaganje predlog tema žaljiva beseda vrsta znak emoji mednarodno"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ponastavitev nastavitve privzeto"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"aplikacije prenos sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"varnost dovoljenj za aplikacije"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"podrsanje geslo vzorec pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. oznake NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Izbira profila"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplikacije"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Dod. dostop dovoljen toliko aplikacijam: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dovoljenih je toliko aplikacij: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4f14a6b..9381ae2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2399,6 +2399,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"текст исправка исправити звук вибрирати аутоматски језик покрет предлагати предлог тема увредљиво реч куцати емоџи међународно"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ресетуј на подразумевана подешавања"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"преузимање апликација, апликације, систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апликације дозволе безбедност"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"превлачење лозинка шаблон pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите Wi-Fi NFC ознаку"</string>
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
@@ -2574,4 +2575,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Изаберите профил"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Дозволе за апликације"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Апликације са додатним приступом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Апликације са дозволом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 340d5c3..4a25674 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"textkorrigering korrigera ljud vibrera automatiskt språk gest föreslå förslag tema stötande ord skriva emoji internationell"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"återställa inställningar standardinställningar"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"appar ladda ned appar system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"appar behörigheter säkerhet"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"dra lösenord mönster pinkod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg för Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Välj profil"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Appens behörigheter"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar har ytterligare åtkomst"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar tillåts"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6ec8380..3121c52 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2396,6 +2396,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"kusahihisha maandishi sahihi sauti tetema otomatiki lugha ishara pendekeza pendekezo mandhari kukera neno chapa emoji kimataifa"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"weka mapendeleo chaguo-msingi upya"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"mfumo wa programu wa kupakua programu"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"usalama wa ruhusa za programu"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"telezesha kidole nenosiri mchoro pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
@@ -2568,4 +2569,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Vipengele vya kina"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Chagua Wasifu"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Idhini ya ufikiaji wa ziada imetolewa kwa programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Inaruhusu programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 69d7d7b..be85c68 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -2363,7 +2363,7 @@
     <string name="keywords_wifi" msgid="8947676711698613374">"வைஃபை நெட்வொர்க் இணைப்பு"</string>
     <string name="keywords_more_default_sms_app" msgid="895656981962034647">"உரை செய்தி செய்தியிடல் செய்திகள் செய்தி அனுப்புதல்"</string>
     <string name="keywords_more_mobile_networks" msgid="4939725094449606744">"செல்லுலார் செல் கேரியர் வயர்லெஸ் டேட்டா 4g 3g 2g lte"</string>
-    <string name="keywords_wifi_calling" msgid="5497735076883598019">"வைஃபை வை-ஃபை அழைப்பு அழைக்கிறது"</string>
+    <string name="keywords_wifi_calling" msgid="5497735076883598019">"வைஃபை வை-ஃபை அழைப்பு அழைத்தல்"</string>
     <string name="keywords_home" msgid="3626170808219458848">"துவக்கி"</string>
     <string name="keywords_display" msgid="6709007669501628320">"திரை டச்ஸ்கிரீன்"</string>
     <string name="keywords_display_brightness_level" msgid="8923289340474728990">"ஒளிமங்கல் திரை டச்ஸ்கிரீன் பேட்டரி"</string>
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"உரை திருத்தம் சரிசெய் ஒலி அதிர்வு தானியங்கு மொழி சைகை பரிந்துரை பரிந்துரைப்பு தீம் வன்மொழி சொல் வகை ஈமோஜி சர்வதேசம்"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"முன்விருப்பத்தேர்வுகளை இயல்புநிலைக்கு மீட்டமை"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ஆப்ஸ் பதிவிறக்கு பயன்பாடுகள் முறைமை"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"பயன்பாடுகள் அனுமதிகள் பாதுகாப்பு"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"ஸ்லைடு கடவுச்சொல் வடிவம் pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
     <string name="choose_profile" msgid="8229363046053568878">"சுயவிவரத்தைத் தேர்வுசெய்யவும்"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"பயன்பாட்டு அனுமதிகள்"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"கூடுதல் அனுமதிகள் வழங்கப்பட்ட பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"அனுமதிக்கப்படும் பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 1b1112a..ceed517 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"వచన దిద్దుబాటు దిద్దుబాటు చేయి ధ్వని వైబ్రేట్ స్వయంచాలకం భాష సంజ్ఞ సూచించు సూచన థీమ్ అభ్యంతరకరమైన పదం రకం ఎమోజీ అంతర్జాతీయం"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"రీసెట్ ప్రాధాన్యతలు డిఫాల్ట్"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"అనువర్తనాలు డౌన్‌లోడ్ అనువర్తనాలు సిస్టమ్"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"అనువర్తనాల అనుమతుల భద్రత"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"స్లయిడ్ చేయడం పాస్‌వర్డ్ నమూనా పిన్"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ట్యాగ్‌ను సెటప్ చేయండి"</string>
     <string name="write_tag" msgid="8571858602896222537">"వ్రాయి"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
     <string name="choose_profile" msgid="8229363046053568878">"ప్రొఫైల్‌ను ఎంచుకోండి"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"అనువర్తన అనుమతులు"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలకు అదన. ప్రాప్యత అనుమతించబడింది"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలు అనుమతించబడ్డాయి"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 22d13f0..11c46db 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"การแก้ไขข้อความ แก้ไข เสียง สั่น อัตโนมัติ ภาษา ท่าทางสัมผัส แนะนำ คำแนะนำ ธีม คำที่ไม่เหมาะสม พิมพ์ อีโมจิ นานาชาติ"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"รีเซ็ตค่ากำหนดเป็นค่าเริ่มต้น"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"แอป ดาวน์โหลด แอปพลิเคชัน ระบบ"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"เลื่อน รหัสผ่าน รูปแบบ PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก NFC สำหรับ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
     <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
     <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b22427e..2e5f11c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"pagwawasto ng text tama tunog i-vibrate awtomatiko wika galaw magmungkahi suhestyon tema nakakapanakit na salita i-type emoji international"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"i-reset ang mga kagustuhan sa default"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"system ng mga application ng pag-download ng mga app"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"i-slide password pattern pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Pumili ng Profile"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e2d515b..2873892 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"metin düzeltme düzelt ses titreşim otomatik dil hareket öner öneri tema rahatsız edici kelime türü emoji uluslararası"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"sıfırlama tercihler varsayılan"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"uygulama indirme uygulamalar sistem"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"kaydırma şifre desen pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 09b87c4..f73f458 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2408,6 +2408,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"виправлення тексту виправити звук вібросигнал автоматично мова жест пропонувати пропозиція тема образливе слово ввести смайли emoji міжнародний"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"відновити параметри за умовчанням"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"додатки завантажити додаток системний"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"додатки дозволи безпека"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"провести пальцем пароль ключ PIN-код"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати NFC-тег для Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
@@ -2586,4 +2587,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Вибрати профіль"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Дозволи додатків"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Додатковий доступ мають стільки додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволено додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index c839358..ecade25 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"‏متن کی اصلاح آواز درست کریں وائبریٹ کریں خودکار زبان اشارہ تجویز کریں تجویز تھیم ناگوار لفظ ٹائپ کریں emoji بین الاقوامی"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"ترجیحات کو ڈیفالٹ پر دوبارہ ترتیب دیں"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ایپس ایپلیکیشنز سسٹم ڈاؤن لوڈ کرتی ہیں"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"‏سلائیڈ پاس ورڈ پیٹرن pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏Wi-Fi NFC ٹیگ ترتیب دیں"</string>
     <string name="write_tag" msgid="8571858602896222537">"تحریر کریں"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
     <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
     <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 6a82eea..cb6c7f6 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"matnni tuzatish, to‘g‘ri, ovoz, tebranish, avto, til, imo-ishora, taklif qilish, taklif, mavzu, haqoratomuz so‘z, yozish, kulgich, xalqaro"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"tiklash shaxsiy sozlamalar birlamchi dastlabki"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"ilovalar yuklab olish tizim"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"surish, parol, chizmali parol, PIN kod"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi’ni sozlash u-n NFC yorliq"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yozish"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Profil tanlash"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 0cf3007..83fd73e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2390,6 +2390,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"sửa văn bản sửa âm thanh rung tự động ngôn ngữ cử chỉ đề xuất đề xuất chủ đề từ xúc phạm nhập biểu tượng cảm xúc quốc tế"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"đặt lại tùy chọn về mặc định"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"hệ thống ứng dụng tải xuống ứng dụng"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"bảo mật giấy phép ứng dụng"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"trượt mật khẩu hình mẫu mã pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
@@ -2562,4 +2563,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Chọn hồ sơ"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Giấy phép ứng dụng"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"Đã cấp quyền truy cập bổ sung cho <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"Đã cho phép <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 189ca6a..ed1b565 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2390,6 +2390,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 文本 更正 声音 提示音 振动 自动 语言 手势 推荐 建议 主题 主题背景 令人反感的字词 输入 表情符号 国际 打字"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重置 偏好设置 默认"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"应用 下载 应用程序 系统"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑动 密码 图案 PIN码"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
@@ -2562,4 +2564,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
     <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b3ef956..3110aaf 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2394,6 +2394,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 聲音 震動 自動 語言 手勢 建議 字詞建議 主題背景 令人反感的文字 輸入 表情圖案 國際"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重設偏好設定預設值"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"應用程式 下載應用程式 系統"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖案 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標籤"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2566,4 +2568,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
     <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dc3cb55..c2e2980 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1462,7 +1462,7 @@
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="debug_view_attributes" msgid="6485448367803310384">"啟用檢視屬性檢查"</string>
-    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端,而不是新的 Android DHCP 用戶端。"</string>
+    <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"使用 Lollipop 的 DHCP 用戶端,不使用新型 Android DHCP 用戶端。"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB 偵錯是針對應用程式開發而設計的功能,可讓您複製電腦和裝置中的資料、不需經由通知即可在裝置上安裝應用程式,以及讀取記錄資料。"</string>
     <string name="adb_keys_warning_message" msgid="6932230298032192937">"要針對先前授權的所有電腦撤銷 USB 偵錯權限嗎?"</string>
@@ -2394,6 +2394,8 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"文字 更正 修正 音效 震動 自動 語言 手勢 建議 字詞建議 主題 令人反感 字詞 輸入 表情符號 國際"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"重設 偏好設定 預設值"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"app 下載 應用程式 系統"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"滑動 密碼 圖形 PIN"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 Wi-Fi NFC 標記"</string>
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
@@ -2566,4 +2568,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
     <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 99f6873..09a151f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2397,6 +2397,7 @@
     <string name="keywords_keyboard_and_ime" msgid="5251531893531063855">"ukulungiswa kombhalo ukulungisa imsindo ukudlidliza ulimi lokuzenzakalelayo ukuthinta ukuphakamisa isiphakamiso itimu igama elingalungile uhlobo i-emoji okwamazwe"</string>
     <string name="keywords_reset_apps" msgid="6420313678620788457">"setha kabusha izintandokazi"</string>
     <string name="keywords_all_apps" msgid="5377153522551809915">"izinhlelo zokusebenza zilanda isistimu yezinhleloz kusebenza"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ukuvikeleka kwezimvume zezinhlelo zokusebenza"</string>
     <string name="keywords_lockscreen" msgid="4806191868723291541">"slayida iphini yephethini yephasiwedi"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
@@ -2569,4 +2570,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
     <string name="choose_profile" msgid="8229363046053568878">"Khetha iphrofayela"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Izimvume zohlelo lokusebenza"</string>
+    <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe ekufinyeleleni okungeziwe"</string>
+    <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a927cf4..cf8c474 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1802,7 +1802,7 @@
     <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
     <string name="wifi_calling_settings_title">Wi-Fi calling</string>
     <!-- WFC mode [CHAR LIMIT=30] -->
-    <string name="wifi_calling_mode_title">Wi-Fi calling mode</string>
+    <string name="wifi_calling_mode_title">Calling preference</string>
     <!-- WFC mode dialog [CHAR LIMIT=30] -->
     <string name="wifi_calling_mode_dialog_title">Wi-Fi calling mode</string>
     <string-array name="wifi_calling_mode_choices">
@@ -1815,14 +1815,8 @@
         <item>"1"</item>
         <item>"0"</item>
     </string-array>
-    <!-- WFC, summary for Disabled [CHAR LIMIT=100] -->
-    <string name="wifi_calling_off_summary">Off</string>
-    <!-- WFC, summary for Wi-Fi Preferred [CHAR LIMIT=100] -->
-    <string name="wfc_mode_wifi_preferred_summary">Wi-Fi preferred (Uses cell network only if Wi-Fi isn\'t available)</string>
-    <!-- WFC, summary for Cellular Preferred [CHAR LIMIT=100] -->
-    <string name="wfc_mode_cellular_preferred_summary">Cellular preferred (Uses Wi-Fi only if cell network isn\'t available)</string>
-    <!-- WFC, summary for Wi-Fi Only [CHAR LIMIT=100] -->
-    <string name="wfc_mode_wifi_only_summary">Wi-Fi only (Never uses cell network. Can\'t make or receive calls if Wi-Fi isn\'t available)</string>
+    <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+    <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>
 
     <!-- Sound and alerts settings -->
     <skip/>
@@ -2893,6 +2887,8 @@
     <string name="show_running_services">Show running services</string>
     <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
     <string name="show_background_processes">Show cached processes</string>
+    <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+    <string name="default_emergency_app">Default emergency app</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
     <string name="reset_app_preferences">Reset app preferences</string>
     <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
@@ -5640,7 +5636,9 @@
     <string name="keywords_users">restriction restrict restricted</string>
     <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string>
     <string name="keywords_reset_apps">reset preferences default</string>
+    <string name="keywords_emergency_app">emergency ice app default</string>
     <string name="keywords_all_apps">apps download applications system</string>
+    <string name="keywords_app_permissions">apps permissions security</string>
     <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
     <string name="keywords_lockscreen">slide password pattern pin</string>
 
@@ -5694,6 +5692,9 @@
     <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
     <string name="zen_mode_option_important_interruptions">Allow only priority interruptions</string>
 
+    <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+    <string name="zen_mode_option_alarms">Allow only alarms</string>
+
     <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
     <string name="zen_mode_option_no_interruptions">Don\'t interrupt</string>
 
@@ -6139,4 +6140,12 @@
    <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
    <string name="choose_profile">Choose Profile</string>
 
+   <!-- Label for list that shows all permissions -->
+   <string name="app_permissions">App permissions</string>
+   <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+   <string name="app_permissions_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed additional access</string>
+   <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+   <string name="app_permissions_group_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed</string>
+
 </resources>
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index a6cec13..2bbd5be 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -20,6 +20,12 @@
     android:key="applications_settings">
 
     <PreferenceScreen
+        android:key="manage_perms"
+        android:fragment="com.android.settings.applications.ManagePermissions"
+        android:title="@string/app_permissions"
+        settings:keywords="@string/keywords_app_permissions" />
+
+    <PreferenceScreen
         android:key="all_apps"
         android:fragment="com.android.settings.applications.ManageApplications"
         android:title="@string/filter_all_apps"
@@ -35,4 +41,9 @@
         android:summary="@string/reset_app_preferences_description"
         settings:keywords="@string/keywords_reset_apps" />
 
+    <com.android.settings.applications.DefaultEmergencyPreference
+        android:key="default_emergency_app"
+        android:title="@string/default_emergency_app"
+        settings:keywords="@string/keywords_emergency_app" />
+
 </PreferenceScreen>
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 7c30de8..440d098 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -20,6 +20,7 @@
     <timezone id="America/Manaus"></timezone>
     <timezone id="America/Santiago"></timezone>
     <timezone id="America/St_Johns"></timezone>
+    <timezone id="America/Recife"></timezone>
     <timezone id="America/Sao_Paulo"></timezone>
     <timezone id="America/Buenos_Aires"></timezone>
     <timezone id="America/Godthab"></timezone>
@@ -37,6 +38,7 @@
     <timezone id="Africa/Brazzaville"></timezone>
     <timezone id="Asia/Amman"></timezone>
     <timezone id="Europe/Athens"></timezone>
+    <timezone id="Europe/Istanbul"></timezone>
     <timezone id="Asia/Beirut"></timezone>
     <timezone id="Africa/Cairo"></timezone>
     <timezone id="Europe/Helsinki"></timezone>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 7a4ed9a..b615c9e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -38,6 +38,12 @@
         android:persistent="false" />
 
     <PreferenceScreen
+        android:key="wifi_calling_settings"
+        android:title="@string/wifi_calling_settings_title"
+        settings:keywords="@string/keywords_wifi_calling"
+        android:fragment="com.android.settings.WifiCallingSettings" />
+
+    <PreferenceScreen
         android:fragment="com.android.settings.nfc.AndroidBeam"
         android:key="android_beam_settings"
         android:title="@string/android_beam_settings_title" />
@@ -63,12 +69,6 @@
             android:targetClass="com.android.phone.MobileNetworkSettings" />
     </PreferenceScreen>
 
-    <PreferenceScreen
-        android:key="wifi_calling_settings"
-        android:title="@string/wifi_calling_settings_title"
-        settings:keywords="@string/keywords_wifi_calling"
-        android:fragment="com.android.settings.WifiCallingSettings" />
-
     <Preference
         android:key="manage_mobile_plan"
         android:title="@string/manage_mobile_plan_title"
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 7dac884..1da9ac7 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -34,9 +34,9 @@
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.security.KeyStore;
-import android.service.fingerprint.Fingerprint;
-import android.service.fingerprint.FingerprintManager;
-import android.service.fingerprint.FingerprintManager.RemovalCallback;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
 import android.util.EventLog;
 import android.util.Log;
 import android.view.accessibility.AccessibilityManager;
diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index c54272f..96e612b 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -32,8 +32,8 @@
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.os.Vibrator;
-import android.service.fingerprint.FingerprintManager;
-import android.service.fingerprint.FingerprintManager.EnrollmentCallback;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
index d086ff7..c134cfb 100644
--- a/src/com/android/settings/FingerprintSettings.java
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -29,11 +29,11 @@
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.service.fingerprint.Fingerprint;
-import android.service.fingerprint.FingerprintManager;
-import android.service.fingerprint.FingerprintManager.AuthenticationCallback;
-import android.service.fingerprint.FingerprintManager.RemovalCallback;
-import android.service.fingerprint.FingerprintManager.AuthenticationResult;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
+import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
+import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
index 96b7296..604af18 100644
--- a/src/com/android/settings/InstrumentedFragment.java
+++ b/src/com/android/settings/InstrumentedFragment.java
@@ -23,6 +23,16 @@
  * Instrumented fragment that logs visibility state.
  */
 public abstract class InstrumentedFragment extends PreferenceFragment {
+    // Declare new temproary categories here, starting after this value.
+    public static final int VIEW_CATEGORY_UNDECLARED = 100000;
+
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
     protected abstract int getMetricsCategory();
 
     @Override
diff --git a/src/com/android/settings/InstrumentedPreferenceActivity.java b/src/com/android/settings/InstrumentedPreferenceActivity.java
index 8ad88b0..480d5c7 100644
--- a/src/com/android/settings/InstrumentedPreferenceActivity.java
+++ b/src/com/android/settings/InstrumentedPreferenceActivity.java
@@ -23,6 +23,13 @@
  * Instrumented activity that logs visibility state.
  */
 public abstract class InstrumentedPreferenceActivity extends PreferenceActivity {
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
     protected abstract int getMetricsCategory();
 
     @Override
diff --git a/src/com/android/settings/InstrumentedPreferenceFragment.java b/src/com/android/settings/InstrumentedPreferenceFragment.java
index 1d86102..f56bce0 100644
--- a/src/com/android/settings/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/InstrumentedPreferenceFragment.java
@@ -23,6 +23,13 @@
  * Instrumented preference fragment that logs visibility state.
  */
 public abstract class InstrumentedPreferenceFragment extends PreferenceFragment {
+    /**
+     * Declare the view of this category.
+     *
+     * Categories are defined in {@link com.android.internal.logging.MetricsLogger}
+     * or if there is no relevant existing category you may define one in
+     * {@link com.android.settings.InstrumentedFragment}.
+     */
     protected abstract int getMetricsCategory();
 
     @Override
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 9e5017e..1edc7a9 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -18,19 +18,12 @@
 
 import android.app.Fragment;
 import android.content.Context;
-import android.net.IConnectivityManager;
-import android.net.NetworkPolicy;
+import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
-import android.net.NetworkTemplate;
-import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,11 +33,7 @@
 import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.net.VpnConfig;
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.PhoneFactory;
-import com.android.settings.net.NetworkPolicyEditor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -77,93 +66,29 @@
             }
             // TODO maybe show a progress dialog if this ends up taking a while
 
-            IConnectivityManager connectivityService = IConnectivityManager.Stub.asInterface(
-                    ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+            ConnectivityManager connectivityManager = (ConnectivityManager)
+                    getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (connectivityManager != null) {
+                connectivityManager.factoryReset();
+            }
+
             WifiManager wifiManager = (WifiManager)
                     getActivity().getSystemService(Context.WIFI_SERVICE);
+            if (wifiManager != null) {
+                wifiManager.factoryReset();
+            }
+
             TelephonyManager telephonyManager = (TelephonyManager)
                     getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-            NetworkPolicyManager policyManager = NetworkPolicyManager.from(getActivity());
-            NetworkPolicyEditor policyEditor = new NetworkPolicyEditor(policyManager);
-            policyEditor.read();
-
-            // Turn airplane mode off
-            try {
-                connectivityService.setAirplaneMode(false);
-            } catch (RemoteException e) {
-                // Well, we tried
+            if (telephonyManager != null) {
+                telephonyManager.factoryReset(mSubId);
             }
 
-            // Turn wifi on
-            wifiManager.setWifiEnabled(true);
-
-            // Delete all Wifi SSIDs
-            List<WifiConfiguration> networks = wifiManager.getConfiguredNetworks();
-            if (networks != null) {
-                for (WifiConfiguration config : networks) {
-                    wifiManager.removeNetwork(config.networkId);
-                }
-                wifiManager.saveConfiguration();
-            }
-
-            // Turn mobile hotspot off
-            wifiManager.setWifiApEnabled(null, false);
-
-            // Un-tether
-            try {
-                for (String tether : connectivityService.getTetheredIfaces()) {
-                    connectivityService.untether(tether);
-                }
-            } catch (RemoteException e) {
-                // Well, we tried
-            }
-
-            // Turn VPN off
-            try {
-                VpnConfig vpnConfig = connectivityService.getVpnConfig();
-                if (vpnConfig != null) {
-                    if (vpnConfig.legacy) {
-                        connectivityService.prepareVpn(VpnConfig.LEGACY_VPN, VpnConfig.LEGACY_VPN);
-                    } else {
-                        // Prevent this app from initiating VPN connections in the future without
-                        // user intervention.
-                        connectivityService.setVpnPackageAuthorization(false);
-                        connectivityService.prepareVpn(vpnConfig.user, VpnConfig.LEGACY_VPN);
-                    }
-                }
-            } catch (RemoteException e) {
-                // Well, we tried
-            }
-
-            if (SubscriptionManager.isUsableSubIdValue(mSubId)) {
-                // Turn mobile data on
-                telephonyManager.setDataEnabled(mSubId, true);
-
-                // Set mobile network selection mode to automatic
-                // TODO set network selection mode to automatic
-                // phone.setNetworkSelectionModeAutomatic(null);
-
-                // Set preferred mobile network type to manufacturer's recommended
-                // int networkType = ; // TODO get manufacturer's default
-                // telephonyManager.setPreferredNetworkType(networkType);
-
-                // Turn roaming to manufacturer's default
-                // boolean enabled = ; // TODO get manufacturer's default
-                // SubscriptionManager.from(getContext()).setDataRoaming(enabled, mSubId);
-
+            NetworkPolicyManager policyManager = (NetworkPolicyManager)
+                    getActivity().getSystemService(Context.NETWORK_POLICY_SERVICE);
+            if (policyManager != null) {
                 String subscriberId = telephonyManager.getSubscriberId(mSubId);
-                NetworkTemplate template = NetworkTemplate.buildTemplateMobileAll(subscriberId);
-                // Turn mobile data limit off
-                policyEditor.setPolicyLimitBytes(template, NetworkPolicy.LIMIT_DISABLED);
-            }
-
-            // Turn restrict background data off
-            policyManager.setRestrictBackground(false);
-
-            // Remove app's "restrict background data" flag
-            for (int uid : policyManager.getUidsWithPolicy(
-                    NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND)) {
-                policyManager.setUidPolicy(uid, NetworkPolicyManager.POLICY_NONE);
+                policyManager.factoryReset(subscriberId);
             }
 
             Toast.makeText(getActivity(), R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index df217c8..3ac2ac6 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -40,8 +40,8 @@
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.security.KeyStore;
-import android.service.fingerprint.Fingerprint;
-import android.service.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
 import android.service.trust.TrustAgentService;
 import android.telephony.TelephonyManager;
 import android.telephony.SubscriptionManager;
diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 0638c94..c950949 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -25,10 +25,12 @@
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceScreen;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
@@ -53,6 +55,7 @@
     private SwitchBar mSwitchBar;
     private Switch mSwitch;
     private ListPreference mButtonWfcMode;
+    private TextView mEmptyView;
 
     private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         /*
@@ -90,6 +93,10 @@
         mSwitchBar = activity.getSwitchBar();
         mSwitch = mSwitchBar.getSwitch();
         mSwitchBar.show();
+
+        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+        mEmptyView.setText(R.string.wifi_calling_off_explanation);
     }
 
     @Override
@@ -107,7 +114,7 @@
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
         builder.setMessage(message)
                 .setTitle(title)
-                .setIcon(android.R.drawable.stat_sys_warning)
+                .setIcon(android.R.drawable.ic_dialog_alert)
                 .setPositiveButton(android.R.string.ok, null);
         AlertDialog dialog = builder.create();
         dialog.show();
@@ -212,6 +219,13 @@
         int wfcMode = ImsManager.getWfcMode(context);
         mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
         mButtonWfcMode.setEnabled(isChecked);
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        if (isChecked) {
+            preferenceScreen.addPreference(mButtonWfcMode);
+        } else {
+            preferenceScreen.removePreference(mButtonWfcMode);
+        }
     }
 
     @Override
@@ -230,17 +244,17 @@
     }
 
     static int getWfcModeSummary(Context context, int wfcMode) {
-        int resId = R.string.wifi_calling_off_summary;
+        int resId = com.android.internal.R.string.wifi_calling_off_summary;
         if (ImsManager.isWfcEnabledByUser(context)) {
             switch (wfcMode) {
                 case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
-                    resId = R.string.wfc_mode_wifi_only_summary;
+                    resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
                     break;
                 case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
-                    resId = R.string.wfc_mode_cellular_preferred_summary;
+                    resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;
                     break;
                 case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
-                    resId = R.string.wfc_mode_wifi_preferred_summary;
+                    resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
                     break;
                 default:
                     Log.e(TAG, "Unexpected WFC mode value: " + wfcMode);
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index 28ac1d0..d5ab8dc 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -26,6 +26,7 @@
 import android.content.DialogInterface;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.NetworkPolicyManager;
 import android.os.AsyncTask;
@@ -34,9 +35,11 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
+import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -47,22 +50,25 @@
 import com.android.settings.applications.ApplicationsState.AppEntry;
 import com.android.settings.applications.ApplicationsState.Callbacks;
 import com.android.settings.applications.ApplicationsState.Session;
+import com.android.settings.applications.PermissionsInfo.Callback;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class AdvancedAppSettings extends SettingsPreferenceFragment implements Callbacks,
-        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener, Callback {
 
     static final String TAG = "AdvancedAppSettings";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
+    private static final String KEY_APP_PERM = "manage_perms";
     private static final String KEY_ALL_APPS = "all_apps";
     private static final String KEY_RESET_ALL = "reset_all";
     private static final String EXTRA_RESET_DIALOG = "resetDialog";
 
     private ApplicationsState mApplicationsState;
     private Session mSession;
+    private Preference mAppPerms;
     private Preference mAllApps;
     private Preference mResetAll;
 
@@ -75,6 +81,7 @@
     private NetworkPolicyManager mNpm;
     private AppOpsManager mAom;
     private Handler mHandler;
+    private PermissionsInfo mPermissionsInfo;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -84,6 +91,7 @@
         mApplicationsState = ApplicationsState.getInstance(getActivity().getApplication());
         mSession = mApplicationsState.newSession(this);
 
+        mAppPerms = findPreference(KEY_APP_PERM);
         mAllApps = findPreference(KEY_ALL_APPS);
         mResetAll = findPreference(KEY_RESET_ALL);
         mResetAll.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -136,6 +144,7 @@
     public void onResume() {
         super.onResume();
         mActivityResumed = true;
+        mPermissionsInfo = new PermissionsInfo(getActivity(), this);
     }
 
     @Override
@@ -265,4 +274,11 @@
         // No-op.
     }
 
+    @Override
+    public void onPermissionLoadComplete() {
+        mAppPerms.setSummary(getActivity().getString(R.string.app_permissions_summary,
+                mPermissionsInfo.getRuntimePermAppsGrantedCount(),
+                mPermissionsInfo.getRuntimePermAppsCount()));
+    }
+
 }
diff --git a/src/com/android/settings/applications/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
new file mode 100644
index 0000000..08e6e94
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.applications;
+
+import com.android.internal.util.ArrayUtils;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.AsyncTask;
+import android.preference.ListPreference;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.AttributeSet;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A preference for choosing the default emergency app
+ */
+public class DefaultEmergencyPreference extends ListPreference {
+
+    private final ContentResolver mContentResolver;
+
+    public DefaultEmergencyPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContentResolver = context.getContentResolver();
+        load();
+    }
+
+    @Override
+    protected boolean persistString(String value) {
+        String previousValue = Settings.Secure.getString(mContentResolver,
+                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+
+        if (!TextUtils.isEmpty(value) && !Objects.equals(value, previousValue)) {
+            Settings.Secure.putString(mContentResolver,
+                    Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
+                    value);
+        }
+        setSummary(getEntry());
+        return true;
+    }
+
+    private void load() {
+        new AsyncTask<Void, Void, ArrayMap<String, CharSequence>>() {
+            @Override
+            protected ArrayMap<String, CharSequence> doInBackground(Void[] params) {
+                return resolveAssistPackageAndQueryApps();
+            }
+
+            @Override
+            protected void onPostExecute(ArrayMap<String, CharSequence> entries) {
+                setEntries(entries.values().toArray(new CharSequence[entries.size()]));
+                setEntryValues(entries.keySet().toArray(new String[entries.size()]));
+
+                setValue(Settings.Secure.getString(mContentResolver,
+                        Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION));
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
+    private ArrayMap<String, CharSequence> resolveAssistPackageAndQueryApps() {
+        ArrayMap<String, CharSequence> packages = new ArrayMap<>();
+
+        Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
+        PackageManager packageManager = getContext().getPackageManager();
+        List<ResolveInfo> infos = packageManager.queryIntentActivities(queryIntent, 0);
+
+        PackageInfo bestMatch = null;
+        for (int i = 0; i < infos.size(); i++) {
+            if (infos.get(i) == null || infos.get(i).activityInfo == null
+                    || packages.containsKey(infos.get(i).activityInfo.packageName)) {
+                continue;
+            }
+
+            String packageName = infos.get(i).activityInfo.packageName;
+            CharSequence label = infos.get(i).activityInfo.applicationInfo
+                    .loadLabel(packageManager);
+
+            packages.put(packageName, label);
+
+            PackageInfo packageInfo;
+            try {
+                packageInfo = packageManager.getPackageInfo(packageName, 0);
+            } catch (PackageManager.NameNotFoundException e) {
+                continue;
+            }
+
+            // Get earliest installed app, but prioritize system apps.
+            if (bestMatch == null
+                    || !isSystemApp(bestMatch) && isSystemApp(packageInfo)
+                    || isSystemApp(bestMatch) == isSystemApp(packageInfo)
+                    && bestMatch.firstInstallTime > packageInfo.firstInstallTime) {
+                bestMatch = packageInfo;
+            }
+        }
+
+        String defaultPackage = Settings.Secure.getString(mContentResolver,
+                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+        boolean defaultMissing = TextUtils.isEmpty(defaultPackage)
+                || !packages.containsKey(defaultPackage);
+        if (bestMatch != null && defaultMissing) {
+            Settings.Secure.putString(mContentResolver,
+                    Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
+                    bestMatch.packageName);
+        }
+
+        return packages;
+    }
+
+    private static boolean isSystemApp(PackageInfo info) {
+        return info.applicationInfo != null
+                && (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+    }
+}
diff --git a/src/com/android/settings/applications/ManagePermissions.java b/src/com/android/settings/applications/ManagePermissions.java
new file mode 100644
index 0000000..8fb3e62
--- /dev/null
+++ b/src/com/android/settings/applications/ManagePermissions.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.PermissionsInfo.PermissionGroup;
+
+import java.util.List;
+
+public class ManagePermissions extends SettingsPreferenceFragment
+        implements PermissionsInfo.Callback, OnPreferenceClickListener {
+
+    private static final String TAG = "ManagePermissions";
+
+    private boolean mLoadComplete;
+    private PermissionsInfo mPermissionsInfo;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mPermissionsInfo = new PermissionsInfo(getActivity(), this);
+    }
+
+    private void refreshUi() {
+        PreferenceScreen screen = getPreferenceScreen();
+        if (screen == null) {
+            screen = getPreferenceManager().createPreferenceScreen(getActivity());
+            setPreferenceScreen(screen);
+        } else {
+            screen.removeAll();
+        }
+        final int count = screen.getPreferenceCount();
+        if (count == 0) {
+            List<PermissionGroup> groups = mPermissionsInfo.getGroups();
+            for (PermissionGroup group : groups) {
+                if (group.possibleApps.size() == 0) continue;
+                PermissionPreference pref = new PermissionPreference(getActivity(), group);
+                pref.refreshUi();
+                screen.addPreference(pref);
+            }
+        } else {
+            for (int i = 0; i < count; i++) {
+                ((PermissionPreference) screen.getPreference(i)).refreshUi();
+            }
+        }
+    }
+
+    @Override
+    public void onPermissionLoadComplete() {
+        refreshUi();
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        return true;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.MANAGE_PERMISSIONS;
+    }
+
+    private class PermissionPreference extends Preference implements OnPreferenceClickListener {
+        private final PermissionGroup mGroup;
+
+        public PermissionPreference(Context context, PermissionGroup group) {
+            super(context);
+            setOnPreferenceClickListener(this);
+            mGroup = group;
+        }
+
+        public void refreshUi() {
+            setTitle(mGroup.label);
+            setIcon(mGroup.icon);
+            setSummary(getContext().getString(R.string.app_permissions_group_summary,
+                    mGroup.grantedApps.size(), mGroup.possibleApps.size()));
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            Intent i = new Intent(Intent.ACTION_MANAGE_PERMISSION_APPS)
+                    .putExtra(Intent.EXTRA_PERMISSION_NAME, mGroup.name);
+            try {
+                getActivity().startActivity(i);
+            } catch (ActivityNotFoundException e) {
+                Log.w(TAG, "No app to handle " + i.getAction());
+            }
+            return true;
+        }
+    }
+
+}
diff --git a/src/com/android/settings/applications/PermissionsInfo.java b/src/com/android/settings/applications/PermissionsInfo.java
new file mode 100644
index 0000000..8656d1a
--- /dev/null
+++ b/src/com/android/settings/applications/PermissionsInfo.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class PermissionsInfo {
+
+    private static final String TAG = "PermissionsInfo";
+
+    private final PackageManager mPm;
+    private final ArrayList<PermissionGroup> mGroups = new ArrayList<>();
+    private final Map<String, PermissionGroup> mGroupLookup = new ArrayMap<>();
+    private final Callback mCallback;
+    private final Context mContext;
+    // Count of apps that request runtime permissions.
+    private int mRuntimePermAppsCt;
+    // Count of apps that are granted runtime permissions.
+    private int mRuntimePermAppsGrantedCt;
+
+    public PermissionsInfo(Context context, Callback callback) {
+        mContext = context;
+        mPm = context.getPackageManager();
+        mCallback = callback;
+        new PermissionsLoader().execute();
+    }
+
+    public List<PermissionGroup> getGroups() {
+        synchronized (mGroups) {
+            return new ArrayList<>(mGroups);
+        }
+    }
+
+    public int getRuntimePermAppsCount() {
+        return mRuntimePermAppsCt;
+    }
+
+    public int getRuntimePermAppsGrantedCount() {
+        return mRuntimePermAppsGrantedCt;
+    }
+
+    private PermissionGroup getOrCreateGroup(String permission) {
+        PermissionGroup group = mGroupLookup.get(permission);
+        if (group == null) {
+            // Some permissions don't have a group, in that case treat them like a group
+            // and create their own PermissionGroup (only if they are runtime).
+            try {
+                PermissionInfo info = mPm.getPermissionInfo(permission, 0);
+                if (info.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) {
+                    group = new PermissionGroup();
+                    // TODO: Add default permission icon.
+                    group.icon = info.icon != 0 ? info.loadIcon(mPm) : new ShapeDrawable();
+                    group.name = info.name;
+                    group.label = info.loadLabel(mPm).toString();
+                    mGroups.add(group);
+                    mGroupLookup.put(permission, group);
+                }
+            } catch (NameNotFoundException e) {
+                Log.w(TAG, "Unknown permission " + permission, e);
+            }
+        }
+        return group;
+    }
+
+    private class PermissionsLoader extends AsyncTask<Void, Void, Void> {
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            List<PermissionGroupInfo> groups =
+                    mPm.getAllPermissionGroups(PackageManager.GET_META_DATA);
+            // Get the groups.
+            for (PermissionGroupInfo groupInfo : groups) {
+                PermissionGroup group = new PermissionGroup();
+                // TODO: Add default permission icon.
+                group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : new ShapeDrawable();
+                group.name = groupInfo.name;
+                group.label = groupInfo.loadLabel(mPm).toString();
+                synchronized (mGroups) {
+                    mGroups.add(group);
+                }
+            }
+            // Load permissions and which are runtime.
+            for (PermissionGroup group : mGroups) {
+                try {
+                    List<PermissionInfo> permissions =
+                            mPm.queryPermissionsByGroup(group.name, 0);
+                    for (PermissionInfo info : permissions) {
+                        if (info.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS) continue;
+                        mGroupLookup.put(info.name, group);
+                    }
+                } catch (NameNotFoundException e) {
+                    Log.w(TAG, "Problem getting permissions", e);
+                }
+            }
+            // Load granted info.
+            for (UserHandle user : UserManager.get(mContext).getUserProfiles()) {
+                List<PackageInfo> allApps = mPm.getInstalledPackages(
+                        PackageManager.GET_PERMISSIONS, user.getIdentifier());
+                for (PackageInfo info : allApps) {
+                    if (info.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1
+                            || info.requestedPermissions == null)  {
+                        continue;
+                    }
+                    final int N = info.requestedPermissionsFlags.length;
+                    boolean appHasRuntimePerms = false;
+                    boolean appGrantedRuntimePerms = false;
+                    for (int i = 0; i < N; i++) {
+                        boolean granted = (info.requestedPermissionsFlags[i]
+                                & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
+                        PermissionGroup group = getOrCreateGroup(info.requestedPermissions[i]);
+                        String key = Integer.toString(info.applicationInfo.uid);
+                        if (group != null && !group.possibleApps.contains(key)) {
+                            appHasRuntimePerms = true;
+                            group.possibleApps.add(key);
+                            if (granted) {
+                                appGrantedRuntimePerms = true;
+                                group.grantedApps.add(key);
+                            }
+                        }
+                    }
+                    if (appHasRuntimePerms) {
+                        mRuntimePermAppsCt++;
+                        if (appGrantedRuntimePerms) {
+                            mRuntimePermAppsGrantedCt++;
+                        }
+                    }
+                }
+            }
+            Collections.sort(mGroups);
+
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            mCallback.onPermissionLoadComplete();
+        }
+    }
+
+    public static class PermissionGroup implements Comparable<PermissionGroup> {
+        public final List<String> possibleApps = new ArrayList<>();
+        public final List<String> grantedApps = new ArrayList<>();
+        public String name;
+        public String label;
+        public Drawable icon;
+
+        @Override
+        public int compareTo(PermissionGroup another) {
+            return label.compareTo(another.label);
+        }
+    }
+
+    public interface Callback {
+        void onPermissionLoadComplete();
+    }
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 879cd9d..250b326 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -190,7 +190,7 @@
         } else {
             mDeviceNameEdited = true;
             if (mOkButton != null) {
-                mOkButton.setEnabled(s.length() != 0);
+                mOkButton.setEnabled(s.toString().trim().length() != 0);
             }
         }
     }
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index c2e143a..93e5c4a 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -88,12 +88,14 @@
 
     private static final SettingPrefWithCallback PREF_ZEN_MODE = new SettingPrefWithCallback(
             SettingPref.TYPE_GLOBAL, KEY_ZEN_MODE, Global.ZEN_MODE, Global.ZEN_MODE_OFF,
-            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+            Global.ZEN_MODE_OFF, Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS, Global.ZEN_MODE_ALARMS,
             Global.ZEN_MODE_NO_INTERRUPTIONS) {
         protected String getCaption(Resources res, int value) {
             switch (value) {
                 case Global.ZEN_MODE_NO_INTERRUPTIONS:
                     return res.getString(R.string.zen_mode_option_no_interruptions);
+                case Global.ZEN_MODE_ALARMS:
+                    return res.getString(R.string.zen_mode_option_alarms);
                 case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
                     return res.getString(R.string.zen_mode_option_important_interruptions);
                 default:
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 754dbaa..fe52cf2 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -30,6 +30,7 @@
 import android.widget.Switch;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.search.Index;
 import com.android.settings.widget.SwitchBar;
@@ -209,7 +210,8 @@
                 (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
             mWifiManager.setWifiApEnabled(null, false);
         }
-
+        MetricsLogger.action(mContext,
+                isChecked ? MetricsLogger.ACTION_WIFI_ON : MetricsLogger.ACTION_WIFI_OFF);
         if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
             mSwitchBar.setEnabled(true);
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 0d04622..238db69 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -369,6 +369,7 @@
                 showDialog(WPS_PIN_DIALOG_ID);
                 return true;
             case MENU_ID_SCAN:
+                MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN);
                 mWifiTracker.forceScan();
                 return true;
             case MENU_ID_ADD_NETWORK:
@@ -707,6 +708,7 @@
     }
 
     /* package */ void forget() {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);
         if (!mSelectedAccessPoint.isSaved()) {
             if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
                 // Network is active but has no network ID - must be ephemeral.
@@ -728,10 +730,12 @@
     }
 
     protected void connect(final WifiConfiguration config) {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
         mWifiManager.connect(config, mConnectListener);
     }
 
     protected void connect(final int networkId) {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);
         mWifiManager.connect(networkId, mConnectListener);
     }
 
@@ -748,6 +752,7 @@
      * Called when "add network" button is pressed.
      */
     /* package */ void onAddNetworkPressed() {
+        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_ADD_NETWORK);
         // No exact access point is selected.
         mSelectedAccessPoint = null;
         showDialog(null, true);