Merge tag 'android-13.0.0_r32' into int/13/fp3

Android 13.0.0 release 32

* tag 'android-13.0.0_r32': (41 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add visibility for the new test suite.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Add visibility for the new test suite.
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  RESTRICT AUTOMERGE Show assistant confirmation dialog box only when ""assist_structure_enabled" and/or "assist_screenshot_enabled" are enabled.
  Import translations. DO NOT MERGE ANYWHERE
  ...

Change-Id: Id88ddad0fc9264806afc70fbaccfaf90a8865899
diff --git a/PermissionController/res/values-am/strings.xml b/PermissionController/res/values-am/strings.xml
index 2d738b9..6caaabf 100644
--- a/PermissionController/res/values-am/strings.xml
+++ b/PermissionController/res/values-am/strings.xml
@@ -85,8 +85,8 @@
     <string name="location_settings" msgid="3624412509133422562">"የአካባቢ ቅንብሮች"</string>
     <string name="location_warning" msgid="2381649060929040962">"<xliff:g id="APP_NAME">%1$s</xliff:g> የዚህ መሣሪያ አካባቢ አገልግሎቶች አቅራቢ ነው። የአካባቢ መዳረሻ ከአካባቢ ቅንብሮች ሊሻሻል ይችላል።"</string>
     <string name="system_warning" msgid="1173400963234358816">"ይህን ፍቃድ ከከለከሉ የመሣሪያዎ መሠረታዊ ባህሪያት ከዚህ በኋላ እንደተፈለገው ላይሠሩ ይችላሉ።"</string>
-    <string name="deny_read_media_visual_warning" msgid="3982586279917232827">"ይህ መተግበሪያ የተነደፈው ለቆየ የAndroid ስሪት ነበር። ይህን መሳሪያ ወደ ፎቶዎች እና ቪዲዮዎች መዳረሻ ከከለከሉ፣ ወደ ሙዚቃ እና ሌላ ኦዲዮ መዳረሻም ጭምር ይከለከላል።"</string>
-    <string name="deny_read_media_aural_warning" msgid="8928699919508646732">"ይህ መተግበሪያ የተነደፈው ለቆየ የAndroid ስሪት ነበር። ይህን መሳሪያ ወደ ሙዚቃ እና ሌላ ኦዲዮ መዳረሻ ከከለከሉ፣ ወደ ፎቶዎች እና ቪዲዮዎች መዳረሻም ጭምር ይከለከላል።"</string>
+    <string name="deny_read_media_visual_warning" msgid="3982586279917232827">"ይህ መተግበሪያ የተነደፈው ለቆየ የAndroid ስሪት ነበር። ይህን መሣሪያ ወደ ፎቶዎች እና ቪዲዮዎች መዳረሻ ከከለከሉ፣ ወደ ሙዚቃ እና ሌላ ኦዲዮ መዳረሻም ጭምር ይከለከላል።"</string>
+    <string name="deny_read_media_aural_warning" msgid="8928699919508646732">"ይህ መተግበሪያ የተነደፈው ለቆየ የAndroid ስሪት ነበር። ይህን መሣሪያ ወደ ሙዚቃ እና ሌላ ኦዲዮ መዳረሻ ከከለከሉ፣ ወደ ፎቶዎች እና ቪዲዮዎች መዳረሻም ጭምር ይከለከላል።"</string>
     <string name="cdm_profile_revoke_warning" msgid="4443893270719106700">"ይህንን ፈቃድ ከከለከሉ፣ በዚህ መተግበሪያ የሚተዳደሩ አንዳንድ የመሣሪያዎ ገጽታዎች ከአሁን በኋላ እንደታሰበው ላይሠሩ ይችላሉ።"</string>
     <string name="permission_summary_enforced_by_policy" msgid="4443598170942950519">"በመመሪያ ተፈጻሚ የሆነ"</string>
     <string name="permission_summary_disabled_by_policy_background_only" msgid="221995005556362660">"የጀርባ መዳረሻ በመመሪያ ተሰናክሏል"</string>
@@ -396,7 +396,7 @@
     <string name="ongoing_usage_dialog_separator" msgid="1715181526581520068">"፣ "</string>
     <string name="ongoing_usage_dialog_last_separator" msgid="4170995004748832163">" እና "</string>
     <string name="default_app_search_keyword" msgid="8330125736889689743">"ነባሪ መተግበሪያዎች"</string>
-    <string name="permgroup_list_microphone_and_camera" msgid="962768198001487969">"ድምጽ ማጉያ እና ካሜራ"</string>
+    <string name="permgroup_list_microphone_and_camera" msgid="962768198001487969">"ድምፅ ማጉያ እና ካሜራ"</string>
     <string name="settings_button" msgid="4414988414732479636">"ቅንብሮች"</string>
     <string name="default_apps" msgid="5119201969348748639">"ነባሪ መተግበሪያዎች"</string>
     <string name="no_default_apps" msgid="2593466527182950231">"ምንም ነባሪ መተግበሪያዎች የሉም"</string>
diff --git a/PermissionController/res/values-ar/strings.xml b/PermissionController/res/values-ar/strings.xml
index 9ade5b1..9214d94 100644
--- a/PermissionController/res/values-ar/strings.xml
+++ b/PermissionController/res/values-ar/strings.xml
@@ -46,7 +46,7 @@
     <string name="grant_dialog_button_allow_foreground" msgid="501896824973636533">"أثناء استخدام التطبيق"</string>
     <string name="grant_dialog_button_change_to_precise_location" msgid="3273115879467236033">"تغيير إلى الموقع الجغرافي الدقيق"</string>
     <string name="grant_dialog_button_keey_approximate_location" msgid="438025182769080011">"البقاء على الموقع الجغرافي التقريبي"</string>
-    <string name="grant_dialog_button_allow_one_time" msgid="2618088516449706391">"هذه المرَّة فقط"</string>
+    <string name="grant_dialog_button_allow_one_time" msgid="2618088516449706391">"هذه المرّة فقط"</string>
     <string name="grant_dialog_button_allow_background" msgid="8236044729434367833">"السماح طوال الوقت"</string>
     <string name="grant_dialog_button_allow_all_files" msgid="4955436994954829894">"السماح بإدارة كل الملفات"</string>
     <string name="grant_dialog_button_allow_media_only" msgid="4832877658422573832">"السماح بالوصول إلى ملفات الوسائط"</string>
@@ -445,7 +445,7 @@
     <string name="permgrouprequest_coarselocation" msgid="7244605063736425232">"‏هل تريد السماح لتطبيق &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; بالوصول إلى الموقع الجغرافي التقريبي لهذا الجهاز؟"</string>
     <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"دقيق"</string>
     <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"تقريبي"</string>
-    <string name="permgrouprequest_calendar" msgid="1493150855673603806">"‏هل تريد السماح لتطبيق &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; بالدخول إلى التقويم؟"</string>
+    <string name="permgrouprequest_calendar" msgid="1493150855673603806">"‏هل تريد السماح لتطبيق &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; بالوصول إلى التقويم؟"</string>
     <string name="permgrouprequest_sms" msgid="5672063688745420991">"‏هل تريد السماح لتطبيق &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; بإرسال رسائل SMS وعرضها؟"</string>
     <string name="permgrouprequest_storage" msgid="8717773092518621602">"‏هل تريد السماح لتطبيق &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; بالوصول إلى الصور والوسائط والملفات على جهازك؟"</string>
     <string name="permgrouprequest_storage_q_to_s" msgid="8213701872983685505">"‏هل تسمح بوصول &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; إلى &lt;b&gt;الصور والفيديوهات والموسيقى والملفات الصوتية&lt;/b&gt; على هذا الجهاز؟"</string>
diff --git a/PermissionController/res/values-as-television/strings.xml b/PermissionController/res/values-as-television/strings.xml
index 3a8197d..2c92996 100644
--- a/PermissionController/res/values-as-television/strings.xml
+++ b/PermissionController/res/values-as-television/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="grant_dialog_button_deny_dont_ask_again" msgid="747769682501286250">"অস্বীকাৰ কৰক আৰু পুনৰাই নুসুধিব"</string>
-    <string name="grant_dialog_how_to_change" msgid="997462845048160559">"আপুনি ইয়াক পিছত ছেটিং &gt; এপসমূহলৈ গৈ সলনি কৰিব পাৰিব"</string>
+    <string name="grant_dialog_how_to_change" msgid="997462845048160559">"আপুনি ইয়াক পাছত ছেটিং &gt; এপসমূহলৈ গৈ সলনি কৰিব পাৰিব"</string>
     <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
     <string name="preference_show_system_apps" msgid="4262140518693221093">"ছিষ্টেম এপসমূহ দেখুৱাওক"</string>
     <string name="app_permissions_decor_title" msgid="7438716722786036814">"এপৰ অনুমতি"</string>
diff --git a/PermissionController/res/values-as/strings.xml b/PermissionController/res/values-as/strings.xml
index 6e09f3b..3a9800a 100644
--- a/PermissionController/res/values-as/strings.xml
+++ b/PermissionController/res/values-as/strings.xml
@@ -70,7 +70,7 @@
     <string name="additional_permissions" msgid="5801285469338873430">"অতিৰিক্ত অনুমতি"</string>
     <string name="app_permissions_info_button_label" msgid="7633312050729974623">"এপৰ তথ্য খোলক"</string>
     <string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{আৰু # টা}one{আৰু # টা}other{আৰু # টা}}"</string>
-    <string name="old_sdk_deny_warning" msgid="2382236998845153919">"এই এপটো Androidৰ এটা পুৰণা সংস্কৰণৰ বাবে প্ৰস্তুত কৰা হৈছিল। অনুমতি নিদিলে ই বিচৰা ধৰণে কাম নকৰিবও পাৰে।"</string>
+    <string name="old_sdk_deny_warning" msgid="2382236998845153919">"এই এপ্‌টো Androidৰ এটা পুৰণা সংস্কৰণৰ বাবে প্ৰস্তুত কৰা হৈছিল। অনুমতি নিদিলে ই বিচৰা ধৰণে কাম নকৰিবও পাৰে।"</string>
     <string name="storage_supergroup_warning_allow" msgid="103093462784523190">"এই এপ্‌টো Androidৰ এটা পুৰণা সংস্কৰণৰ বাবে ডিজাইন কৰা হৈছিল। যদি আপুনি এই অনুমতিটো দিয়ে, তেন্তে আটাইবোৰ ষ্ট’ৰেজলৈ (ফট’, ভিডিঅ’, সংগীত, অডিঅ’ আৰু অন্য ফাইলসমূহকে ধৰি) এক্সেছৰ অনুমতি দিয়া হ’ব।"</string>
     <string name="storage_supergroup_warning_deny" msgid="6420765672683284347">"এই এপ্‌টো Androidৰ এটা পুৰণা সংস্কৰণৰ বাবে ডিজাইন কৰা হৈছিল। যদি আপুনি এই অনুমতিটো অস্বীকাৰ কৰে, তেন্তে আটাইবোৰ ষ্ট’ৰেজলৈ (ফট’, ভিডিঅ’, সংগীত, অডিঅ’ আৰু অন্য ফাইলসমূহকে ধৰি) এক্সেছ অস্বীকাৰ কৰা হ’ব।"</string>
     <string name="default_permission_description" msgid="4624464917726285203">"অজ্ঞাত কাৰ্য কৰিব পাৰে"</string>
@@ -108,7 +108,7 @@
     <string name="other_permissions" msgid="2901186127193849594">"অন্য এপৰ কার্যক্ষমতা"</string>
     <string name="permission_request_title" msgid="8790310151025020126">"অনুমতি বিচাৰি কৰা অনুৰোধ"</string>
     <string name="screen_overlay_title" msgid="6977038513913222078">"স্ক্ৰীন অভাৰলে\' চিনাক্ত কৰা হৈছে"</string>
-    <string name="screen_overlay_message" msgid="5622563069757142102">"এই অনুমতিৰ ছেটিং সলনি কৰিবলৈ আপুনি প্ৰথমে ছেটিংসমূহ &gt; এপসমূহলৈ গৈ স্ক্ৰীণ অভাৰলে\' অফ কৰিব লাগিব"</string>
+    <string name="screen_overlay_message" msgid="5622563069757142102">"এই অনুমতিৰ ছেটিং সলনি কৰিবলৈ আপুনি প্ৰথমে ছেটিংসমূহ &gt; এপসমূহলৈ গৈ স্ক্ৰীন অভাৰলে\' অফ কৰিব লাগিব"</string>
     <string name="screen_overlay_button" msgid="4655005928054025250">"ছেটিং খোলক"</string>
     <string name="wear_not_allowed_dlg_title" msgid="1429467891296932713">"Android Wear"</string>
     <string name="wear_not_allowed_dlg_text" msgid="512340555334769098">"ইনষ্টল/আনইনষ্টল কাৰ্য Wearত কৰিব নোৱাৰি।"</string>
@@ -292,7 +292,7 @@
     <string name="unused_app_permissions_removed_summary_some" msgid="5080490037831563441">"আপোনাৰ ডেটা সুৰক্ষিত কৰিবলৈ আপুনি কেইমাহমান ব্যৱহাৰ নকৰা কিছুমান এপৰ পৰা অনুমতিসমূহ আঁতৰোৱা হৈছে"</string>
     <string name="one_unused_app_summary" msgid="7831913934488881991">"১ টা এপ্ কেইমাহমান ব্যৱহাৰ কৰা হোৱা নাই"</string>
     <string name="num_unused_apps_summary" msgid="1870719749940571227">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> টা এপ্ কেইমাহমান ব্যৱহাৰ কৰা হোৱা নাই"</string>
-    <string name="permission_subtitle_only_in_foreground" msgid="9068389431267377564">"কেৱল এপটো ব্যৱহাৰ হৈ থকা সময়ত"</string>
+    <string name="permission_subtitle_only_in_foreground" msgid="9068389431267377564">"কেৱল এপ্‌টো ব্যৱহাৰ হৈ থকা সময়ত"</string>
     <string name="permission_subtitle_media_only" msgid="8917869683764720717">"মিডিয়া"</string>
     <string name="permission_subtitle_all_files" msgid="4982613338298067862">"আটাইবোৰ ফাইল"</string>
     <string name="permission_subtitle_background" msgid="8916750995309083180">"সকলো সময়ৰ বাবে অনুমতি দিয়া হৈছে"</string>
@@ -356,7 +356,7 @@
     <string name="role_emergency_search_keywords" msgid="1920007722599213358">"বৰফ"</string>
     <string name="role_home_label" msgid="3871847846649769412">"ডিফ’ল্ট হ’ম এপ্"</string>
     <string name="role_home_short_label" msgid="8544733747952272337">"হ’ম এপ্"</string>
-    <string name="role_home_description" msgid="7997371519626556675">"যিবোৰ এপক সাধাৰণতে লঞ্চাৰ বুলি কোৱা হয় সেই এপ্‌বোৰে আপোনাৰ Android ডিভাইচত গৃহ স্ক্ৰীণৰ ঠাই লয় আৰু আপোনাক নিজৰ ডিভাইচৰ সমল আৰু সুবিধাবোৰৰ এক্সেছ দিয়ে"</string>
+    <string name="role_home_description" msgid="7997371519626556675">"যিবোৰ এপক সাধাৰণতে লঞ্চাৰ বুলি কোৱা হয় সেই এপ্‌বোৰে আপোনাৰ Android ডিভাইচত গৃহ স্ক্ৰীনৰ ঠাই লয় আৰু আপোনাক নিজৰ ডিভাইচৰ সমল আৰু সুবিধাবোৰৰ এক্সেছ দিয়ে"</string>
     <string name="role_home_request_title" msgid="738136983453341081">"<xliff:g id="APP_NAME">%1$s</xliff:g>ক আপোনাৰ ডিফ’ল্ট হ’ম এপ্ হিচাপে ছেট কৰিবনে?"</string>
     <string name="role_home_request_description" msgid="2658833966716057673">"কোনো অনুমতিৰ প্ৰয়োজন নাই"</string>
     <string name="role_home_search_keywords" msgid="3830755001192666285">"লঞ্চাৰ"</string>
diff --git a/PermissionController/res/values-b+sr+Latn/strings.xml b/PermissionController/res/values-b+sr+Latn/strings.xml
index e30a7c1..90e6dc0 100644
--- a/PermissionController/res/values-b+sr+Latn/strings.xml
+++ b/PermissionController/res/values-b+sr+Latn/strings.xml
@@ -332,7 +332,7 @@
     <string name="role_assistant_short_label" msgid="3369003713187703399">"Aplikacija digitalnog pomoćnika"</string>
     <string name="role_assistant_description" msgid="6622458130459922952">"Aplikacije za pomoć mogu da vam pomognu na osnovu informacija sa ekrana koji gledate. Neke aplikacije podržavaju usluge pokretača i glasovnog unosa da bi vam pružile integrisanu pomoć."</string>
     <string name="role_browser_label" msgid="2877796144554070207">"Podrazumevana apl. pregledača"</string>
-    <string name="role_browser_short_label" msgid="6745009127123292296">"Aplikacija za pregledač"</string>
+    <string name="role_browser_short_label" msgid="6745009127123292296">"Aplikacija pregledača"</string>
     <string name="role_browser_description" msgid="3465253637499842671">"Aplikacije koje vam daju pristup internetu i prikazuju linkove koje možete da dodirnete"</string>
     <string name="role_browser_request_title" msgid="2895200507835937192">"Želite li da podesite <xliff:g id="APP_NAME">%1$s</xliff:g> kao podrazumevanu aplikaciju za pregledanje?"</string>
     <string name="role_browser_request_description" msgid="5888803407905985941">"Nije potrebna nijedna dozvola"</string>
diff --git a/PermissionController/res/values-be/strings.xml b/PermissionController/res/values-be/strings.xml
index baa78ab..9506501 100644
--- a/PermissionController/res/values-be/strings.xml
+++ b/PermissionController/res/values-be/strings.xml
@@ -408,9 +408,9 @@
     <string name="default_app_no_apps" msgid="115720991680586885">"Няма праграм"</string>
     <string name="car_default_app_selected" msgid="5416420830430644174">"Выбрана"</string>
     <string name="car_default_app_selected_with_info" msgid="1932204186080593500">"Выбрана – <xliff:g id="ADDITIONAL_INFO">%1$s</xliff:g>"</string>
-    <string name="special_app_access_search_keyword" msgid="8032347212290774210">"спецыяльны доступ да праграм"</string>
-    <string name="special_app_access" msgid="5019319067120213797">"Спецыяльны доступ да праграм"</string>
-    <string name="no_special_app_access" msgid="6950277571805106247">"Няма доступу да праграм"</string>
+    <string name="special_app_access_search_keyword" msgid="8032347212290774210">"спецыяльны доступ для праграм"</string>
+    <string name="special_app_access" msgid="5019319067120213797">"Спецыяльны доступ для праграм"</string>
+    <string name="no_special_app_access" msgid="6950277571805106247">"Няма доступу для праграм"</string>
     <string name="special_app_access_no_apps" msgid="4102911722787886970">"Няма праграм"</string>
     <string name="home_missing_work_profile_support" msgid="1756855847669387977">"Працоўны профіль не падтрымліваецца"</string>
     <string name="encryption_unaware_confirmation_message" msgid="8274491794636402484">"Заўвага. Калі перазапусціць прыладу з наладжанай блакіроўкай экрана, праграма не запусціцца, пакуль вы не разблакіруеце прыладу."</string>
diff --git a/PermissionController/res/values-ca/strings.xml b/PermissionController/res/values-ca/strings.xml
index 78cb40d..126b69f 100644
--- a/PermissionController/res/values-ca/strings.xml
+++ b/PermissionController/res/values-ca/strings.xml
@@ -61,7 +61,7 @@
     <string name="auto_permission_manager_summary" msgid="9157438376234301354">"Gestiona l\'accés a les dades del calendari, dels registres de trucades i més"</string>
     <string name="granted_permission_decision" msgid="7824827491551861365">"Has concedit a <xliff:g id="APP_NAME">%1$s</xliff:g> l\'accés a <xliff:g id="PERMISSION_NAME">%2$s</xliff:g>"</string>
     <string name="denied_permission_decision" msgid="5308961501779563781">"Has denegat a <xliff:g id="APP_NAME">%1$s</xliff:g> l\'accés a <xliff:g id="PERMISSION_NAME">%2$s</xliff:g>"</string>
-    <string name="days_ago" msgid="6650359081551335629">"{count,plural, =0{Avui}=1{Fa 1 dia}other{Fa # dies}}"</string>
+    <string name="days_ago" msgid="6650359081551335629">"{count,plural, =0{Avui}=1{Fa 1 dia}many{# days ago}other{Fa # dies}}"</string>
     <string name="app_disable_dlg_positive" msgid="7418444149981904940">"Desactiva l\'aplicació"</string>
     <string name="app_disable_dlg_text" msgid="3126943217146120240">"Si desactives aquesta aplicació, és possible que Android i altres aplicacions deixin de funcionar com esperes. Tingues en compte que no pots suprimir aquesta aplicació perquè estava preinstal·lada al dispositiu. Si la desactives, l\'aplicació s\'amagarà al dispositiu."</string>
     <string name="app_permission_manager" msgid="3903811137630909550">"Gestor de permisos"</string>
@@ -69,7 +69,7 @@
     <string name="no_permissions" msgid="3881676756371148563">"Sense permisos"</string>
     <string name="additional_permissions" msgid="5801285469338873430">"Permisos addicionals"</string>
     <string name="app_permissions_info_button_label" msgid="7633312050729974623">"Obre la informació de l\'aplicació"</string>
-    <string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{# permís més}other{# permisos més}}"</string>
+    <string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{# permís més}many{# more}other{# permisos més}}"</string>
     <string name="old_sdk_deny_warning" msgid="2382236998845153919">"Aquesta aplicació es va dissenyar per a una versió anterior d\'Android. És possible que no funcioni com està previst si li denegues el permís."</string>
     <string name="storage_supergroup_warning_allow" msgid="103093462784523190">"Aquesta aplicació es va dissenyar per a una versió anterior d\'Android. Si concedeixes aquest permís, es permetrà l\'accés a tot l\'emmagatzematge (inclosos vídeos, fotos, música, àudio i altres fitxers)."</string>
     <string name="storage_supergroup_warning_deny" msgid="6420765672683284347">"Aquesta aplicació es va dissenyar per a una versió anterior d\'Android. Si no concedeixes aquest permís, es denegarà l\'accés a tot l\'emmagatzematge (inclosos vídeos, fotos, música, àudio i altres fitxers)."</string>
@@ -134,10 +134,10 @@
     <string name="auto_permission_usage_timeline_summary" msgid="2713135806453218703">"<xliff:g id="ACCESS_TIME">%1$s</xliff:g> • <xliff:g id="SUMMARY_TEXT">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_2" msgid="1521763591164293683">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_3" msgid="758761785983094351">"<xliff:g id="ATTRIBUTION_NAME">%1$s</xliff:g> • <xliff:g id="APP_NAME">%2$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%3$s</xliff:g>"</string>
-    <string name="duration_used_days" msgid="8293010131040301793">"{count,plural, =1{1 dia}other{# dies}}"</string>
-    <string name="duration_used_hours" msgid="1128716208752263576">"{count,plural, =1{1 hora}other{# hores}}"</string>
-    <string name="duration_used_minutes" msgid="5335824115042576567">"{count,plural, =1{1 min}other{# min}}"</string>
-    <string name="duration_used_seconds" msgid="6543746449171675028">"{count,plural, =1{1 s}other{# s}}"</string>
+    <string name="duration_used_days" msgid="8293010131040301793">"{count,plural, =1{1 dia}many{# days}other{# dies}}"</string>
+    <string name="duration_used_hours" msgid="1128716208752263576">"{count,plural, =1{1 hora}many{# hours}other{# hores}}"</string>
+    <string name="duration_used_minutes" msgid="5335824115042576567">"{count,plural, =1{1 min}many{# mins}other{# min}}"</string>
+    <string name="duration_used_seconds" msgid="6543746449171675028">"{count,plural, =1{1 s}many{# secs}other{# s}}"</string>
     <string name="permission_usage_any_permission" msgid="6358023078298106997">"Qualsevol permís"</string>
     <string name="permission_usage_any_time" msgid="3802087027301631827">"En qualsevol moment"</string>
     <string name="permission_usage_last_7_days" msgid="7386221251886130065">"7 darrers dies"</string>
@@ -160,7 +160,7 @@
     <string name="permission_usage_bar_chart_title_last_minute" msgid="820450867183487607">"Ús de permisos durant l\'últim minut"</string>
     <string name="permission_usage_preference_summary_not_used_24h" msgid="3087783232178611025">"No s\'ha utilitzat en les 24 darreres hores"</string>
     <string name="permission_usage_preference_summary_not_used_7d" msgid="4592301300810120096">"No s\'ha utilitzat en els 7 darrers dies"</string>
-    <string name="permission_usage_preference_label" msgid="8343167938128676378">"{count,plural, =1{Utilitzat per 1 aplicació}other{Utilitzat per # aplicacions}}"</string>
+    <string name="permission_usage_preference_label" msgid="8343167938128676378">"{count,plural, =1{Utilitzat per 1 aplicació}many{Used by # apps}other{Utilitzat per # aplicacions}}"</string>
     <string name="permission_usage_view_details" msgid="6675335735468752787">"Mostra-ho tot al tauler"</string>
     <string name="app_permission_usage_filter_label" msgid="7182861154638631550">"Filtrats per: <xliff:g id="PERM">%1$s</xliff:g>"</string>
     <string name="app_permission_usage_remove_filter" msgid="2926157607436428207">"Suprimeix el filtre"</string>
@@ -250,23 +250,23 @@
     <string name="ask_header" msgid="2633816846459944376">"Pregunta sempre"</string>
     <string name="denied_header" msgid="903209608358177654">"Sense permís"</string>
     <string name="storage_footer_hyperlink_text" msgid="8873343987957834810">"Mostra més aplicacions que poden accedir a tots els fitxers"</string>
-    <string name="days" msgid="609563020985571393">"{count,plural, =1{1 dia}other{# dies}}"</string>
-    <string name="hours" msgid="3447767892295843282">"{count,plural, =1{1 hora}other{# hores}}"</string>
-    <string name="minutes" msgid="4408293038068503157">"{count,plural, =1{1 minut}other{# minuts}}"</string>
-    <string name="seconds" msgid="5397771912131132690">"{count,plural, =1{1 segon}other{# segons}}"</string>
+    <string name="days" msgid="609563020985571393">"{count,plural, =1{1 dia}many{# days}other{# dies}}"</string>
+    <string name="hours" msgid="3447767892295843282">"{count,plural, =1{1 hora}many{# hours}other{# hores}}"</string>
+    <string name="minutes" msgid="4408293038068503157">"{count,plural, =1{1 minut}many{# minutes}other{# minuts}}"</string>
+    <string name="seconds" msgid="5397771912131132690">"{count,plural, =1{1 segon}many{# seconds}other{# segons}}"</string>
     <string name="permission_reminders" msgid="6528257957664832636">"Recordatoris de permisos"</string>
     <string name="auto_revoke_permission_reminder_notification_title_one" msgid="6690347469376854137">"1 aplicació no utilitzada"</string>
     <string name="auto_revoke_permission_reminder_notification_title_many" msgid="6062217713645069960">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> aplicacions no utilitzades"</string>
     <string name="auto_revoke_permission_reminder_notification_content" msgid="4492228990462107487">"S\'han suprimit els permisos per protegir la teva privadesa. Toca per revisar-ho."</string>
     <string name="auto_revoke_permission_notification_title" msgid="2629844160853454657">"S\'han suprimit permisos de les aplicacions no utilitzades"</string>
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"Durant els darrers mesos, no has utilitzat algunes aplicacions. Toca per revisar-ho."</string>
-    <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# aplicació no utilitzada}other{# aplicacions no utilitzades}}"</string>
+    <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# aplicació no utilitzada}many{# unused apps}other{# aplicacions no utilitzades}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"S\'han suprimit els permisos i els fitxers temporals, i s\'han aturat les notificacions. Toca per revisar-ho."</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"Consulta els permisos recents"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"Mentre conduïes, has concedit a <xliff:g id="APP">%1$s</xliff:g> accés a <xliff:g id="PERMISSION">%2$s</xliff:g>"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions" msgid="671791184670801301">"Mentre conduïes, has concedit a <xliff:g id="APP">%1$s</xliff:g> accés a <xliff:g id="PERMISSION_1">%2$s</xliff:g> i <xliff:g id="PERMISSION_2">%3$s</xliff:g>"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_multi_permission" msgid="4080701771111456927">"Mentre conduïes, has concedit <xliff:g id="COUNT">%1$d</xliff:g> permisos a <xliff:g id="APP">%2$s</xliff:g>"</string>
-    <string name="post_drive_permission_decision_reminder_summary_multi_apps" msgid="5253882771252863902">"{count,plural, =1{Mentre conduïes, has concedit accés a <xliff:g id="APP_0">%1$s</xliff:g> i a # aplicació més}other{Mentre conduïes, has concedit accés a <xliff:g id="APP_1">%1$s</xliff:g> i a # aplicacions més}}"</string>
+    <string name="post_drive_permission_decision_reminder_summary_multi_apps" msgid="5253882771252863902">"{count,plural, =1{Mentre conduïes, has concedit accés a <xliff:g id="APP_0">%1$s</xliff:g> i a # aplicació més}many{While driving, you gave <xliff:g id="APP_1">%1$s</xliff:g> &amp; # other apps access}other{Mentre conduïes, has concedit accés a <xliff:g id="APP_1">%1$s</xliff:g> i a # aplicacions més}}"</string>
     <string name="go_to_settings" msgid="1053735612211228335">"Ves a Configuració"</string>
     <string name="auto_revoke_setting_subtitle" msgid="8631720570723050460">"Durant els darrers mesos, no has utilitzat algunes aplicacions"</string>
     <string name="permissions_removed_category_title" msgid="1064754271178447643">"Permisos suprimits"</string>
diff --git a/PermissionController/res/values-cs/strings.xml b/PermissionController/res/values-cs/strings.xml
index 70c456e..b53e031 100644
--- a/PermissionController/res/values-cs/strings.xml
+++ b/PermissionController/res/values-cs/strings.xml
@@ -233,7 +233,7 @@
     <string name="permission_description_summary_nearby_devices" msgid="8269183818275073741">"Aplikace s tímto oprávněním mohou najít zařízení v okolí, připojit se k nim a zjistit jejich relativní polohu"</string>
     <string name="permission_description_summary_microphone" msgid="630834800308329907">"Aplikace s tímto oprávněním mohou nahrávat zvuk"</string>
     <string name="permission_description_summary_phone" msgid="4515277217435233619">"Aplikace s tímto oprávněním mohou realizovat a spravovat telefonické hovory"</string>
-    <string name="permission_description_summary_sensors" msgid="1836045815643119949">"Aplikace s tímto oprávněním mají přístup k datům ze snímačů vašich životních funkcí"</string>
+    <string name="permission_description_summary_sensors" msgid="1836045815643119949">"Aplikace s tímto oprávněním mají přístup k datům ze senzorů vašich životních funkcí"</string>
     <string name="permission_description_summary_sms" msgid="725999468547768517">"Aplikace s tímto oprávněním mohou odesílat a zobrazovat SMS"</string>
     <string name="permission_description_summary_storage" msgid="6575759089065303346">"Aplikace s tímto oprávněním mají přístup k  fotkám, médiím a souborům v zařízení"</string>
     <string name="permission_description_summary_read_media_aural" msgid="3354728149930482199">"Aplikace s tímto oprávněním mají přístup k hudbě a dalším zvukovým souborům v zařízení"</string>
@@ -467,7 +467,7 @@
     <string name="permgroupupgraderequestdetail_camera" msgid="6642747548010962597">"Tato aplikace chce pořizovat snímky a nahrávat videa kdykoli, dokonce i když ji nepoužíváte. "<annotation id="link">"Povolit v nastavení"</annotation></string>
     <string name="permgrouprequest_calllog" msgid="2065327180175371397">"Povolit aplikaci &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; přístup k seznamu telefonních hovorů?"</string>
     <string name="permgrouprequest_phone" msgid="1829234136997316752">"Povolit aplikaci &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; uskutečňovat a spravovat telefonní hovory?"</string>
-    <string name="permgrouprequest_sensors" msgid="4397358316850652235">"Povolit aplikaci &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; přístup k údajům ze snímačů vašich životních funkcí?"</string>
+    <string name="permgrouprequest_sensors" msgid="4397358316850652235">"Povolit aplikaci &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; přístup k údajům ze senzorů vašich životních funkcí?"</string>
     <string name="permgroupupgraderequestdetail_sensors" msgid="6651914048792092835">"Aplikace požaduje přístup k datům ze senzorů vašich životních funkcí vždy, i když ji nebudete používat. Pokud tuto změnu chcete provést, "<annotation id="link">"přejděte do nastavení."</annotation></string>
     <string name="permgroupbackgroundrequest_sensors" msgid="5661924322018503886">"Povolit aplikaci &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; přístup k datům ze senzorů vašich životních funkcí?"</string>
     <string name="permgroupbackgroundrequestdetail_sensors" msgid="7726767635834043501">"Pokud chcete této aplikaci povolit trvalý přístup k datům z tělesných senzorů, i když aplikaci nepoužíváte, "<annotation id="link">"přejděte do nastavení"</annotation>"."</string>
diff --git a/PermissionController/res/values-da/strings.xml b/PermissionController/res/values-da/strings.xml
index b763496..189e059 100644
--- a/PermissionController/res/values-da/strings.xml
+++ b/PermissionController/res/values-da/strings.xml
@@ -372,7 +372,7 @@
     <string name="role_call_screening_request_description" msgid="7338511921032446006">"Der kræves ingen tilladelser"</string>
     <string name="role_automotive_navigation_label" msgid="2701890757955474751">"Standardapp til navigation"</string>
     <string name="role_automotive_navigation_short_label" msgid="5165823092506922457">"App til navigation"</string>
-    <string name="role_automotive_navigation_description" msgid="7834601873792870134">"Apps, som kan give vejledning til søgninger efter interessante steder og detaljeret rutevejledning"</string>
+    <string name="role_automotive_navigation_description" msgid="7834601873792870134">"Apps, som kan give vejledning til søgninger efter interessante lokationer og detaljeret rutevejledning"</string>
     <string name="role_automotive_navigation_request_title" msgid="7525693151489384300">"Vil du angive <xliff:g id="APP_NAME">%1$s</xliff:g> som din standardapp til navigation?"</string>
     <string name="role_automotive_navigation_request_description" msgid="7073023813249245540">"Der kræves ingen tilladelser"</string>
     <string name="role_watch_description" msgid="267003778693177779">"<xliff:g id="APP_NAME">%1$s</xliff:g> får tilladelse til at interagere med dine notifikationer og får adgang til dine tilladelser for Opkald, Sms, Kontakter og Kalender."</string>
diff --git a/PermissionController/res/values-en-rAU/strings.xml b/PermissionController/res/values-en-rAU/strings.xml
index 40af810..3b644b5 100644
--- a/PermissionController/res/values-en-rAU/strings.xml
+++ b/PermissionController/res/values-en-rAU/strings.xml
@@ -26,7 +26,7 @@
     <string name="uninstall_or_disable" msgid="4496612999740858933">"Uninstall or disable"</string>
     <string name="app_not_found_dlg_title" msgid="6029482906093859756">"App not found"</string>
     <string name="grant_dialog_button_deny" msgid="88262611492697192">"Don\'t allow"</string>
-    <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow &amp; don’t ask again"</string>
+    <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow and don’t ask again"</string>
     <string name="grant_dialog_button_no_upgrade" msgid="8344732743633736625">"Keep \'While the app is in use\'"</string>
     <string name="grant_dialog_button_no_upgrade_one_time" msgid="5125892775684968694">"Keep \'Only this time\'"</string>
     <string name="grant_dialog_button_more_info" msgid="213350268561945193">"More info"</string>
diff --git a/PermissionController/res/values-en-rCA-television/strings.xml b/PermissionController/res/values-en-rCA-television/strings.xml
index 923ce15..aed6c88 100644
--- a/PermissionController/res/values-en-rCA-television/strings.xml
+++ b/PermissionController/res/values-en-rCA-television/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="grant_dialog_button_deny_dont_ask_again" msgid="747769682501286250">"Deny and don\'t ask again"</string>
     <string name="grant_dialog_how_to_change" msgid="997462845048160559">"You can change this later in Settings &gt; Apps"</string>
-    <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
+    <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
     <string name="preference_show_system_apps" msgid="4262140518693221093">"Show system apps"</string>
     <string name="app_permissions_decor_title" msgid="7438716722786036814">"App permissions"</string>
     <string name="manage_permissions_decor_title" msgid="4138423885439613577">"App permissions"</string>
diff --git a/PermissionController/res/values-en-rCA-v33/strings.xml b/PermissionController/res/values-en-rCA-v33/strings.xml
index 643c0db..5c58c79 100644
--- a/PermissionController/res/values-en-rCA-v33/strings.xml
+++ b/PermissionController/res/values-en-rCA-v33/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="role_dialer_request_description" msgid="6188305064871543419">"This app will be allowed to send you notifications, and will be given access to your camera, contacts, microphone, phone and SMS"</string>
-    <string name="role_sms_request_description" msgid="1506966389698625395">"This app will be allowed to send you notifications, and will be given access to your camera, contacts, files, microphone, phone and SMS"</string>
+    <string name="role_dialer_request_description" msgid="6188305064871543419">"This app will be allowed to send you Notifications, and will be given access to your Camera, Contacts, Microphone, Phone, and SMS"</string>
+    <string name="role_sms_request_description" msgid="1506966389698625395">"This app will be allowed to send you Notifications, and will be given access to your Camera, Contacts, Files, Microphone, Phone, and SMS"</string>
     <string name="permission_description_summary_storage" msgid="1917071243213043858">"Apps with this permission can access all files on this device"</string>
 </resources>
diff --git a/PermissionController/res/values-en-rCA-watch/strings.xml b/PermissionController/res/values-en-rCA-watch/strings.xml
index 70643f5..adecb65 100644
--- a/PermissionController/res/values-en-rCA-watch/strings.xml
+++ b/PermissionController/res/values-en-rCA-watch/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5709879604352260492">"Deny. Don\'t ask again"</string>
-    <string name="current_permission_template" msgid="6634462553790549887">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
+    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5709879604352260492">"Deny, don\'t ask again"</string>
+    <string name="current_permission_template" msgid="6634462553790549887">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
     <string name="preference_show_system_apps" msgid="1055740303992024300">"Show system apps"</string>
     <string name="permission_summary_enforced_by_policy" msgid="2352478756952948019">"Can\'t be changed"</string>
     <string name="generic_yes" msgid="2489207724988649846">"Yes"</string>
diff --git a/PermissionController/res/values-en-rCA/strings.xml b/PermissionController/res/values-en-rCA/strings.xml
index 40af810..7d08dbe 100644
--- a/PermissionController/res/values-en-rCA/strings.xml
+++ b/PermissionController/res/values-en-rCA/strings.xml
@@ -25,10 +25,10 @@
     <string name="blocked" msgid="9195547604866033708">"Blocked"</string>
     <string name="uninstall_or_disable" msgid="4496612999740858933">"Uninstall or disable"</string>
     <string name="app_not_found_dlg_title" msgid="6029482906093859756">"App not found"</string>
-    <string name="grant_dialog_button_deny" msgid="88262611492697192">"Don\'t allow"</string>
+    <string name="grant_dialog_button_deny" msgid="88262611492697192">"Don’t allow"</string>
     <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow &amp; don’t ask again"</string>
-    <string name="grant_dialog_button_no_upgrade" msgid="8344732743633736625">"Keep \'While the app is in use\'"</string>
-    <string name="grant_dialog_button_no_upgrade_one_time" msgid="5125892775684968694">"Keep \'Only this time\'"</string>
+    <string name="grant_dialog_button_no_upgrade" msgid="8344732743633736625">"Keep “While the app is in use”"</string>
+    <string name="grant_dialog_button_no_upgrade_one_time" msgid="5125892775684968694">"Keep “Only this time”"</string>
     <string name="grant_dialog_button_more_info" msgid="213350268561945193">"More info"</string>
     <string name="grant_dialog_button_deny_anyway" msgid="7225905870668915151">"Don’t allow anyway"</string>
     <string name="grant_dialog_button_dismiss" msgid="1930399742250226393">"Dismiss"</string>
@@ -54,16 +54,16 @@
     <string name="app_permissions" msgid="3369917736607944781">"App permissions"</string>
     <string name="unused_apps" msgid="2058057455175955094">"Unused apps"</string>
     <string name="no_unused_apps" msgid="12809387670415295">"No unused apps"</string>
-    <string name="zero_unused_apps" msgid="9024448554157499748">"Zero unused apps"</string>
+    <string name="zero_unused_apps" msgid="9024448554157499748">"0 unused apps"</string>
     <string name="review_permission_decisions" msgid="309559429150613632">"Recent permission decisions"</string>
     <string name="review_permission_decisions_view_all" msgid="90391040431566130">"View all recent permission decisions"</string>
     <string name="review_permission_decisions_empty" msgid="8120775336417279806">"No recent permission decisions"</string>
-    <string name="auto_permission_manager_summary" msgid="9157438376234301354">"Manage data access to calendar, call logs and more"</string>
+    <string name="auto_permission_manager_summary" msgid="9157438376234301354">"Manage data access to calendar, call logs, and more"</string>
     <string name="granted_permission_decision" msgid="7824827491551861365">"You gave <xliff:g id="APP_NAME">%1$s</xliff:g> access to <xliff:g id="PERMISSION_NAME">%2$s</xliff:g>"</string>
     <string name="denied_permission_decision" msgid="5308961501779563781">"You denied <xliff:g id="APP_NAME">%1$s</xliff:g> access to <xliff:g id="PERMISSION_NAME">%2$s</xliff:g>"</string>
     <string name="days_ago" msgid="6650359081551335629">"{count,plural, =0{Today}=1{1 day ago}other{# days ago}}"</string>
     <string name="app_disable_dlg_positive" msgid="7418444149981904940">"Disable app"</string>
-    <string name="app_disable_dlg_text" msgid="3126943217146120240">"If you disable this app, Android and other apps may no longer function as intended. Remember that you can’t delete this app as it came pre-installed on your device. By disabling it, you turn this app off and hide it on your device."</string>
+    <string name="app_disable_dlg_text" msgid="3126943217146120240">"If you disable this app, Android and other apps may no longer function as intended. Keep in mind, you can’t delete this app since it came pre-installed on your device. By disabling, you turn this app off and hide it on your device."</string>
     <string name="app_permission_manager" msgid="3903811137630909550">"Permission manager"</string>
     <string name="never_ask_again" msgid="4728762438198560329">"Don\'t ask again"</string>
     <string name="no_permissions" msgid="3881676756371148563">"No permissions"</string>
@@ -71,8 +71,8 @@
     <string name="app_permissions_info_button_label" msgid="7633312050729974623">"Open app info"</string>
     <string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{# more}other{# more}}"</string>
     <string name="old_sdk_deny_warning" msgid="2382236998845153919">"This app was designed for an older version of Android. Denying permission may cause it to no longer function as intended."</string>
-    <string name="storage_supergroup_warning_allow" msgid="103093462784523190">"This app was designed for an older version of Android. If you allow this permission, then access to all storage (including photos, videos, music, audio and other files) will be allowed."</string>
-    <string name="storage_supergroup_warning_deny" msgid="6420765672683284347">"This app was designed for an older version of Android. If you deny this permission, then access to all storage (including photos, videos, music, audio and other files) will be denied."</string>
+    <string name="storage_supergroup_warning_allow" msgid="103093462784523190">"This app was designed for an older version of Android. If you allow this permission, then access to all storage (including photos, videos, music, audio, and other files) will be allowed."</string>
+    <string name="storage_supergroup_warning_deny" msgid="6420765672683284347">"This app was designed for an older version of Android. If you deny this permission, then access to all storage (including photos, videos, music, audio, and other files) will be denied."</string>
     <string name="default_permission_description" msgid="4624464917726285203">"perform an unknown action"</string>
     <string name="app_permissions_group_summary" msgid="8788419008958284002">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed"</string>
     <string name="app_permissions_group_summary2" msgid="4329922444840521150">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> apps allowed"</string>
@@ -102,18 +102,18 @@
     <!-- no translation found for background_access_chooser_dialog_choices:2 (4305536986042401191) -->
     <string name="permission_access_always" msgid="1474641821883823446">"Allow all the time"</string>
     <string name="permission_access_only_foreground" msgid="7801170728159326195">"Allow only while using the app"</string>
-    <string name="permission_access_never" msgid="4647014230217936900">"Don\'t allow"</string>
+    <string name="permission_access_never" msgid="4647014230217936900">"Don’t allow"</string>
     <string name="loading" msgid="4789365003890741082">"Loading…"</string>
     <string name="all_permissions" msgid="6911125611996872522">"All permissions"</string>
     <string name="other_permissions" msgid="2901186127193849594">"Other app capabilities"</string>
     <string name="permission_request_title" msgid="8790310151025020126">"Permission request"</string>
     <string name="screen_overlay_title" msgid="6977038513913222078">"Screen overlay detected"</string>
-    <string name="screen_overlay_message" msgid="5622563069757142102">"To change this permission setting, you have to turn off the screen overlay first from Settings &gt; Apps"</string>
+    <string name="screen_overlay_message" msgid="5622563069757142102">"To change this permission setting, you first have to turn off the screen overlay from Settings &gt; Apps"</string>
     <string name="screen_overlay_button" msgid="4655005928054025250">"Open settings"</string>
     <string name="wear_not_allowed_dlg_title" msgid="1429467891296932713">"Android Wear"</string>
     <string name="wear_not_allowed_dlg_text" msgid="512340555334769098">"Install/Uninstall actions not supported on Wear."</string>
     <string name="permission_review_title_template_install" msgid="1284337937156289081">"Choose what to allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access"</string>
-    <string name="permission_review_title_template_update" msgid="3232333580548588657">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; has been updated. Choose what access to allow this app."</string>
+    <string name="permission_review_title_template_update" msgid="3232333580548588657">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; has been updated. Choose what to allow this app to access."</string>
     <string name="review_button_cancel" msgid="2191147944056548886">"Cancel"</string>
     <string name="review_button_continue" msgid="2527918375047602199">"Continue"</string>
     <string name="new_permissions_category" msgid="552995090178417611">"New permissions"</string>
@@ -125,7 +125,7 @@
     <string name="permission_group_usage_title" msgid="2595013198075285173">"<xliff:g id="PERMGROUP">%1$s</xliff:g> usage"</string>
     <string name="perm_usage_adv_info_title" msgid="3357831829538873708">"See other permissions"</string>
     <string name="perm_usage_adv_info_summary_2_items" msgid="3702175198750127822">"<xliff:g id="PERMGROUP_0">%1$s</xliff:g>, <xliff:g id="PERMGROUP_1">%2$s</xliff:g>"</string>
-    <string name="perm_usage_adv_info_summary_more_items" msgid="949055326299562218">"<xliff:g id="PERMGROUP_0">%1$s</xliff:g>, <xliff:g id="PERMGROUP_1">%2$s</xliff:g> and <xliff:g id="NUM">%3$s</xliff:g> more"</string>
+    <string name="perm_usage_adv_info_summary_more_items" msgid="949055326299562218">"<xliff:g id="PERMGROUP_0">%1$s</xliff:g>, <xliff:g id="PERMGROUP_1">%2$s</xliff:g>, and <xliff:g id="NUM">%3$s</xliff:g> more"</string>
     <string name="permission_group_usage_subtitle_24h" msgid="5120155996322114181">"Timeline of when apps used your <xliff:g id="PERMGROUP">%1$s</xliff:g> in the past 24 hours"</string>
     <string name="permission_group_usage_subtitle_7d" msgid="1465828402260324654">"Timeline of when apps used your <xliff:g id="PERMGROUP">%1$s</xliff:g> in the past 7 days"</string>
     <string name="permission_usage_access_dialog_subtitle" msgid="4171772805196955753">"When this app used your <xliff:g id="PERMGROUP">%1$s</xliff:g> permission"</string>
@@ -186,7 +186,7 @@
     <string name="app_permission_button_allow_always" msgid="4573292371734011171">"Allow all the time"</string>
     <string name="app_permission_button_allow_foreground" msgid="1991570451498943207">"Allow only while using the app"</string>
     <string name="app_permission_button_ask" msgid="3342950658789427">"Ask every time"</string>
-    <string name="app_permission_button_deny" msgid="6016454069832050300">"Don\'t allow"</string>
+    <string name="app_permission_button_deny" msgid="6016454069832050300">"Don’t allow"</string>
     <string name="precise_image_description" msgid="6349638632303619872">"Precise location"</string>
     <string name="approximate_image_description" msgid="938803699637069884">"Approximate location"</string>
     <string name="app_permission_location_accuracy" msgid="7166912915040018669">"Use precise location"</string>
@@ -195,18 +195,18 @@
     <string name="app_permission_header" msgid="2951363137032603806">"<xliff:g id="PERM">%1$s</xliff:g> access for this app"</string>
     <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"See all <xliff:g id="APP">%1$s</xliff:g> permissions"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"See all apps with this permission"</string>
-    <string name="assistant_mic_label" msgid="1011432357152323896">"Show Assistant microphone usage"</string>
+    <string name="assistant_mic_label" msgid="1011432357152323896">"Show assistant microphone usage"</string>
     <string name="unused_apps_category_title" msgid="2988455616845243901">"Unused app settings"</string>
     <string name="auto_revoke_label" msgid="5068393642936571656">"Remove permissions if app isn’t used"</string>
     <string name="unused_apps_label" msgid="2595428768404901064">"Remove permissions and free up space"</string>
     <string name="unused_apps_label_v2" msgid="7058776770056517980">"Pause app activity if unused"</string>
-    <string name="unused_apps_summary" msgid="8839466950318403115">"Remove permissions, delete temporary files and stop notifications"</string>
+    <string name="unused_apps_summary" msgid="8839466950318403115">"Remove permissions, delete temporary files, and stop notifications"</string>
     <string name="auto_revoke_summary" msgid="5867548789805911683">"To protect your data, permissions for this app will be removed if the app is unused for a few months."</string>
     <string name="auto_revoke_summary_with_permissions" msgid="389712086597285013">"To protect your data, if the app is unused for a few months, the following permissions will be removed: <xliff:g id="PERMS">%1$s</xliff:g>"</string>
     <string name="auto_revoked_apps_page_summary" msgid="6594753657893756536">"To protect your data, permissions have been removed from apps that you haven’t used in a few months."</string>
     <string name="auto_revoke_open_app_message" msgid="8075556291711205039">"If you want to allow permissions again, open the app."</string>
     <string name="auto_revoke_disabled" msgid="8697684442991567188">"Automatic removal is currently disabled for this app."</string>
-    <string name="auto_revocable_permissions_none" msgid="8334929619113991466">"No auto-revocable permissions are currently granted"</string>
+    <string name="auto_revocable_permissions_none" msgid="8334929619113991466">"No auto revocable permissions are currently granted"</string>
     <string name="auto_revocable_permissions_one" msgid="5299112369449458176">"<xliff:g id="PERM">%1$s</xliff:g> permission will be removed."</string>
     <string name="auto_revocable_permissions_two" msgid="4874067408752041716">"<xliff:g id="PERM_0">%1$s</xliff:g> and <xliff:g id="PERM_1">%2$s</xliff:g> permissions will be removed."</string>
     <string name="auto_revocable_permissions_many" msgid="1521807896206032992">"Permissions that will be removed: <xliff:g id="PERMS">%1$s</xliff:g>."</string>
@@ -221,27 +221,27 @@
     <string name="last_opened_category_title" msgid="7871347400611202595">"Last opened more than <xliff:g id="NUMBER">%s</xliff:g> months ago"</string>
     <string name="last_opened_summary" msgid="5248984030024968808">"App last opened on <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="last_opened_summary_short" msgid="1646067226191176825">"Last opened <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="app_permission_footer_special_file_access" msgid="1884202176147657788">"If you allow management of all files, this app can access, modify and delete any files in common storage on this device or connected storage devices. The app may access files without asking you."</string>
+    <string name="app_permission_footer_special_file_access" msgid="1884202176147657788">"If you allow management of all files, this app can access, modify, and delete any files in common storage on this device or connected storage devices. The app may access files without asking you."</string>
     <string name="special_file_access_dialog" msgid="583804114020740610">"Allow this app to access, modify and delete files on the device, or any connected storage devices? This app may access files without asking you."</string>
     <string name="permission_description_summary_generic" msgid="5401399408814903391">"Apps with this permission can <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
-    <string name="permission_description_summary_activity_recognition" msgid="2652850576497070146">"Apps with this permission can access your physical activity, such as walking, cycling, driving, step count and more"</string>
+    <string name="permission_description_summary_activity_recognition" msgid="2652850576497070146">"Apps with this permission can access your physical activity, like walking, biking, driving, step count, and more"</string>
     <string name="permission_description_summary_calendar" msgid="103329982944411010">"Apps with this permission can access your calendar"</string>
-    <string name="permission_description_summary_call_log" msgid="7321437186317577624">"Apps with this permission can read and write phone call logs"</string>
+    <string name="permission_description_summary_call_log" msgid="7321437186317577624">"Apps with this permission can read and write phone call log"</string>
     <string name="permission_description_summary_camera" msgid="108004375101882069">"Apps with this permission can take pictures and record video"</string>
     <string name="permission_description_summary_contacts" msgid="2337798886460408996">"Apps with this permission can access your contacts"</string>
     <string name="permission_description_summary_location" msgid="2817531799933480694">"Apps with this permission can access this device\'s location"</string>
-    <string name="permission_description_summary_nearby_devices" msgid="8269183818275073741">"Apps with this permission can find, connect to and determine the relative position of nearby devices"</string>
+    <string name="permission_description_summary_nearby_devices" msgid="8269183818275073741">"Apps with this permission can find, connect to, and determine the relative position of nearby devices"</string>
     <string name="permission_description_summary_microphone" msgid="630834800308329907">"Apps with this permission can record audio"</string>
     <string name="permission_description_summary_phone" msgid="4515277217435233619">"Apps with this permission can make and manage phone calls"</string>
     <string name="permission_description_summary_sensors" msgid="1836045815643119949">"Apps with this permission can access sensor data about your vital signs"</string>
     <string name="permission_description_summary_sms" msgid="725999468547768517">"Apps with this permission can send and view SMS messages"</string>
-    <string name="permission_description_summary_storage" msgid="6575759089065303346">"Apps with this permission can access photos, media and files on your device"</string>
+    <string name="permission_description_summary_storage" msgid="6575759089065303346">"Apps with this permission can access photos, media, and files on your device"</string>
     <string name="permission_description_summary_read_media_aural" msgid="3354728149930482199">"Apps with this permission can access music and other audio files on this device"</string>
     <string name="permission_description_summary_read_media_visual" msgid="4991801977881732641">"Apps with this permission can access photos and videos on this device"</string>
     <string name="app_permission_most_recent_summary" msgid="4292074449384040590">"Last access: <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
-    <string name="app_permission_most_recent_denied_summary" msgid="7659497197737708112">"Currently denied/Last access: <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
+    <string name="app_permission_most_recent_denied_summary" msgid="7659497197737708112">"Currently denied / Last access: <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
     <string name="app_permission_never_accessed_summary" msgid="401346181461975090">"Never accessed"</string>
-    <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"Denied/Never accessed"</string>
+    <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"Denied / Never accessed"</string>
     <string name="allowed_header" msgid="7769277978004790414">"Allowed"</string>
     <string name="allowed_always_header" msgid="6455903312589013545">"Allowed all the time"</string>
     <string name="allowed_foreground_header" msgid="6845655788447833353">"Allowed only while in use"</string>
@@ -259,7 +259,7 @@
     <string name="auto_revoke_permission_reminder_notification_title_many" msgid="6062217713645069960">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> unused apps"</string>
     <string name="auto_revoke_permission_reminder_notification_content" msgid="4492228990462107487">"Permissions removed to protect your privacy. Tap to review"</string>
     <string name="auto_revoke_permission_notification_title" msgid="2629844160853454657">"Permissions removed for unused apps"</string>
-    <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"Some apps haven’t been used for a few months. Tap to review."</string>
+    <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"Some apps haven’t been used in a few months. Tap to review."</string>
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# unused app}other{# unused apps}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"Permissions and temporary files have been removed and notifications were stopped. Tap to review."</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"Check recent permissions"</string>
@@ -268,7 +268,7 @@
     <string name="post_drive_permission_decision_reminder_summary_1_app_multi_permission" msgid="4080701771111456927">"While driving, you granted <xliff:g id="COUNT">%1$d</xliff:g> permissions to <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="post_drive_permission_decision_reminder_summary_multi_apps" msgid="5253882771252863902">"{count,plural, =1{While driving, you gave <xliff:g id="APP_0">%1$s</xliff:g> &amp; # other app access}other{While driving, you gave <xliff:g id="APP_1">%1$s</xliff:g> &amp; # other apps access}}"</string>
     <string name="go_to_settings" msgid="1053735612211228335">"Go to Settings"</string>
-    <string name="auto_revoke_setting_subtitle" msgid="8631720570723050460">"Some apps haven’t been used for a few months"</string>
+    <string name="auto_revoke_setting_subtitle" msgid="8631720570723050460">"Some apps haven’t been used in a few months"</string>
     <string name="permissions_removed_category_title" msgid="1064754271178447643">"Removed permissions"</string>
     <string name="permission_removed_page_title" msgid="2627436155091001209">"Permissions removed"</string>
     <string name="all_unused_apps_category_title" msgid="755663524704745414">"All unused apps"</string>
@@ -277,24 +277,24 @@
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> got your location in the background"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"This app can always access your location. Tap to change."</string>
     <string name="auto_revoke_after_notification_title" msgid="5417761027669887431">"App permissions removed to protect privacy"</string>
-    <string name="auto_revoke_after_notification_content_one" msgid="6804038707453662753">"<xliff:g id="APP_NAME">%s</xliff:g> hasn’t been used for a few months. Tap to review."</string>
-    <string name="auto_revoke_after_notification_content_two" msgid="9108709764831425172">"<xliff:g id="APP_NAME">%s</xliff:g> and one other app haven’t been used for a few months. Tap to review."</string>
-    <string name="auto_revoke_after_notification_content_many" msgid="4774106206289751220">"<xliff:g id="APP_NAME">%1$s</xliff:g> and <xliff:g id="NUMBER_OF_APPS">%2$s</xliff:g> other apps haven’t been used for a few months. Tap to review."</string>
-    <string name="auto_revoke_before_notification_title_one" msgid="6758024954464359876">"One app is unused"</string>
+    <string name="auto_revoke_after_notification_content_one" msgid="6804038707453662753">"<xliff:g id="APP_NAME">%s</xliff:g> hasn’t been used in a few months. Tap to review."</string>
+    <string name="auto_revoke_after_notification_content_two" msgid="9108709764831425172">"<xliff:g id="APP_NAME">%s</xliff:g> and 1 other app haven’t been used in a few months. Tap to review."</string>
+    <string name="auto_revoke_after_notification_content_many" msgid="4774106206289751220">"<xliff:g id="APP_NAME">%1$s</xliff:g> and <xliff:g id="NUMBER_OF_APPS">%2$s</xliff:g> other apps haven’t been used in a few months. Tap to review."</string>
+    <string name="auto_revoke_before_notification_title_one" msgid="6758024954464359876">"1 app is unused"</string>
     <string name="auto_revoke_before_notification_title_many" msgid="4415543943846385685">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> apps are unused"</string>
     <string name="auto_revoke_before_notification_content_one" msgid="1156635373417068822">"Permissions will be removed to protect your privacy. Tap to review."</string>
     <string name="unused_apps_title" msgid="8589298917717872239">"Unused apps"</string>
     <string name="unused_apps_subtitle_after" msgid="2034267519506357898">"Permissions removed from"</string>
     <string name="unused_apps_subtitle_before" msgid="5233302577076132427">"Permissions will be removed from"</string>
     <string name="unused_permissions_subtitle_two" msgid="2207266295008423015">"<xliff:g id="PERM_NAME_0">%1$s</xliff:g> and <xliff:g id="PERM_NAME_1">%2$s</xliff:g>"</string>
-    <string name="unused_permissions_subtitle_many" msgid="4387289202207450238">"<xliff:g id="PERM_NAME_0">%1$s</xliff:g>, <xliff:g id="PERM_NAME_1">%2$s</xliff:g> and <xliff:g id="NUMBER_OF_PERMISSIONS">%3$s</xliff:g> more"</string>
-    <string name="unused_app_permissions_removed_summary" msgid="6779039455326071033">"To protect your data, permissions have been removed from apps that you haven’t used for a few months"</string>
-    <string name="unused_app_permissions_removed_summary_some" msgid="5080490037831563441">"To protect your data, permissions have been removed from some apps that you haven’t used for a few months"</string>
-    <string name="one_unused_app_summary" msgid="7831913934488881991">"1 app hasn’t been used for a few months"</string>
+    <string name="unused_permissions_subtitle_many" msgid="4387289202207450238">"<xliff:g id="PERM_NAME_0">%1$s</xliff:g>, <xliff:g id="PERM_NAME_1">%2$s</xliff:g>, and <xliff:g id="NUMBER_OF_PERMISSIONS">%3$s</xliff:g> more"</string>
+    <string name="unused_app_permissions_removed_summary" msgid="6779039455326071033">"To protect your data, permissions have been removed from apps that you haven’t used in a few months"</string>
+    <string name="unused_app_permissions_removed_summary_some" msgid="5080490037831563441">"To protect your data, permissions have been removed from some apps that you haven’t used in a few months"</string>
+    <string name="one_unused_app_summary" msgid="7831913934488881991">"1 app hasen’t been used for a few months"</string>
     <string name="num_unused_apps_summary" msgid="1870719749940571227">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> apps haven’t been used for a few months"</string>
     <string name="permission_subtitle_only_in_foreground" msgid="9068389431267377564">"Only while app is in use"</string>
     <string name="permission_subtitle_media_only" msgid="8917869683764720717">"Media"</string>
-    <string name="permission_subtitle_all_files" msgid="4982613338298067862">"All files"</string>
+    <string name="permission_subtitle_all_files" msgid="4982613338298067862">"All Files"</string>
     <string name="permission_subtitle_background" msgid="8916750995309083180">"Allowed all the time"</string>
     <string name="app_perms_24h_access" msgid="99069906850627181">"Last accessed <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
     <string name="app_perms_24h_access_yest" msgid="5411926024794555022">"Last accessed yesterday at <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string>
@@ -311,11 +311,11 @@
     <string name="app_perms_7d_access_media_only" msgid="1031096653668235200">"Last accessed <xliff:g id="TIME_DATE_0">%1$s</xliff:g> at <xliff:g id="TIME_DATE_1">%2$s</xliff:g> • Media"</string>
     <string name="app_perms_content_provider_24h_media_only" msgid="7797963000596179491">"Accessed in past 24 hours • Media"</string>
     <string name="app_perms_content_provider_7d_media_only" msgid="8446239884570262243">"Accessed in past 7 days • Media"</string>
-    <string name="app_perms_24h_access_all_files" msgid="8902360456978159091">"Last accessed <xliff:g id="TIME_DATE">%1$s</xliff:g> • All files"</string>
-    <string name="app_perms_24h_access_yest_all_files" msgid="5708424073126844909">"Last accessed yesterday at <xliff:g id="TIME_DATE">%1$s</xliff:g> • All files"</string>
-    <string name="app_perms_7d_access_all_files" msgid="8246193786397635824">"Last accessed <xliff:g id="TIME_DATE_0">%1$s</xliff:g> at <xliff:g id="TIME_DATE_1">%2$s</xliff:g> • All files"</string>
-    <string name="app_perms_content_provider_24h_all_files" msgid="573104317727770850">"Accessed in past 24 hours • All files"</string>
-    <string name="app_perms_content_provider_7d_all_files" msgid="7962416229708835558">"Accessed in past 7 days • All files"</string>
+    <string name="app_perms_24h_access_all_files" msgid="8902360456978159091">"Last accessed <xliff:g id="TIME_DATE">%1$s</xliff:g> • All Files"</string>
+    <string name="app_perms_24h_access_yest_all_files" msgid="5708424073126844909">"Last accessed yesterday at <xliff:g id="TIME_DATE">%1$s</xliff:g> • All Files"</string>
+    <string name="app_perms_7d_access_all_files" msgid="8246193786397635824">"Last accessed <xliff:g id="TIME_DATE_0">%1$s</xliff:g> at <xliff:g id="TIME_DATE_1">%2$s</xliff:g> • All Files"</string>
+    <string name="app_perms_content_provider_24h_all_files" msgid="573104317727770850">"Accessed in past 24 hours • All Files"</string>
+    <string name="app_perms_content_provider_7d_all_files" msgid="7962416229708835558">"Accessed in past 7 days • All Files"</string>
     <string name="no_permissions_allowed" msgid="6081976856354669209">"No permissions allowed"</string>
     <string name="no_permissions_denied" msgid="8159923922804043282">"No permissions denied"</string>
     <string name="no_apps_allowed" msgid="7718822655254468631">"No apps allowed"</string>
@@ -326,27 +326,27 @@
     <string name="settings" msgid="5409109923158713323">"Settings"</string>
     <string name="accessibility_service_dialog_title_single" msgid="7956432823014102366">"<xliff:g id="SERVICE_NAME">%s</xliff:g> has full access to your device"</string>
     <string name="accessibility_service_dialog_title_multiple" msgid="5527879210683548175">"<xliff:g id="NUM_SERVICES">%s</xliff:g> accessibility apps have full access to your device"</string>
-    <string name="accessibility_service_dialog_bottom_text_single" msgid="1128666197822205958">"<xliff:g id="SERVICE_NAME">%s</xliff:g> can view your screen, actions and inputs, perform actions and control the display."</string>
-    <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"These apps can view your screen, actions and inputs, perform actions, and control the display."</string>
+    <string name="accessibility_service_dialog_bottom_text_single" msgid="1128666197822205958">"<xliff:g id="SERVICE_NAME">%s</xliff:g> can view your screen, actions, and inputs, perform actions, and control the display."</string>
+    <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"These apps can view your screen, actions, and inputs, perform actions, and control the display."</string>
     <string name="role_assistant_label" msgid="4727586018198208128">"Default digital assistant app"</string>
     <string name="role_assistant_short_label" msgid="3369003713187703399">"Digital assistant app"</string>
-    <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you based on information from the screen that you’re viewing. Some apps support both launcher and voice input services to give you integrated assistance."</string>
+    <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you based on information from the screen you’re viewing. Some apps support both launcher and voice input services to give you integrated assistance."</string>
     <string name="role_browser_label" msgid="2877796144554070207">"Default browser app"</string>
     <string name="role_browser_short_label" msgid="6745009127123292296">"Browser app"</string>
-    <string name="role_browser_description" msgid="3465253637499842671">"Apps that give you access to the Internet and display links that you tap"</string>
+    <string name="role_browser_description" msgid="3465253637499842671">"Apps that give you access to the internet and display links that you tap"</string>
     <string name="role_browser_request_title" msgid="2895200507835937192">"Set <xliff:g id="APP_NAME">%1$s</xliff:g> as your default browser app?"</string>
     <string name="role_browser_request_description" msgid="5888803407905985941">"No permissions needed"</string>
     <string name="role_dialer_label" msgid="1100224146343237968">"Default phone app"</string>
     <string name="role_dialer_short_label" msgid="7186888549465352489">"Phone app"</string>
     <string name="role_dialer_description" msgid="8768708633696539612">"Apps that allow you to make and receive telephone calls on your device"</string>
     <string name="role_dialer_request_title" msgid="5959618560705912058">"Set <xliff:g id="APP_NAME">%1$s</xliff:g> as your default phone app?"</string>
-    <string name="role_dialer_request_description" msgid="6288839625724909320">"This app will be given access to your camera, contacts, microphone, phone and SMS"</string>
-    <string name="role_dialer_search_keywords" msgid="3324448983559188087">"dialler"</string>
+    <string name="role_dialer_request_description" msgid="6288839625724909320">"This app will be given access to your Camera, Contacts, Microphone, Phone, and SMS"</string>
+    <string name="role_dialer_search_keywords" msgid="3324448983559188087">"dialer"</string>
     <string name="role_sms_label" msgid="8456999857547686640">"Default SMS app"</string>
     <string name="role_sms_short_label" msgid="4371444488034692243">"SMS app"</string>
-    <string name="role_sms_description" msgid="3424020199148153513">"Apps that allow you to use your phone number to send and receive short text messages, photos, videos and more"</string>
+    <string name="role_sms_description" msgid="3424020199148153513">"Apps that allow you to use your phone number to send and receive short text messages, photos, videos, and more"</string>
     <string name="role_sms_request_title" msgid="7953552109601185602">"Set <xliff:g id="APP_NAME">%1$s</xliff:g> as your default SMS app?"</string>
-    <string name="role_sms_request_description" msgid="2691004766132144886">"This app will be given access to your camera, contacts, files and media, microphone, phone and SMS"</string>
+    <string name="role_sms_request_description" msgid="2691004766132144886">"This app will be given access to your Camera, Contacts, Files and media, Microphone, Phone, and SMS"</string>
     <string name="role_sms_search_keywords" msgid="8022048144395047352">"text message, texting, messages, messaging"</string>
     <string name="role_emergency_label" msgid="7028825857206842366">"Default emergency app"</string>
     <string name="role_emergency_short_label" msgid="2388431453335350348">"Emergency app"</string>
@@ -365,9 +365,9 @@
     <string name="role_call_redirection_description" msgid="6091669882014664420">"Apps that allow you to forward outgoing calls to another phone number"</string>
     <string name="role_call_redirection_request_title" msgid="2816244455003562925">"Set <xliff:g id="APP_NAME">%1$s</xliff:g> as your default call redirection app?"</string>
     <string name="role_call_redirection_request_description" msgid="3118895714178527164">"No permissions needed"</string>
-    <string name="role_call_screening_label" msgid="883935222060878724">"Default caller ID and spam app"</string>
-    <string name="role_call_screening_short_label" msgid="2048465565063130834">"Caller ID and spam app"</string>
-    <string name="role_call_screening_description" msgid="2349431420497468981">"Apps that allow you to identify calls and block spam, robocalls or unwanted numbers"</string>
+    <string name="role_call_screening_label" msgid="883935222060878724">"Default caller ID &amp; spam app"</string>
+    <string name="role_call_screening_short_label" msgid="2048465565063130834">"Caller ID &amp; spam app"</string>
+    <string name="role_call_screening_description" msgid="2349431420497468981">"Apps that allow you to identify calls and block spam, robocalls, or unwanted numbers"</string>
     <string name="role_call_screening_request_title" msgid="7358309224566977290">"Set <xliff:g id="APP_NAME">%1$s</xliff:g> as your default caller ID &amp; spam app?"</string>
     <string name="role_call_screening_request_description" msgid="7338511921032446006">"No permissions needed"</string>
     <string name="role_automotive_navigation_label" msgid="2701890757955474751">"Default navigation app"</string>
@@ -377,26 +377,26 @@
     <string name="role_automotive_navigation_request_description" msgid="7073023813249245540">"No permissions needed"</string>
     <string name="role_watch_description" msgid="267003778693177779">"<xliff:g id="APP_NAME">%1$s</xliff:g> will be allowed to interact with your notifications and access your Phone, SMS, Contacts and Calendar permissions."</string>
     <string name="role_app_streaming_description" msgid="7341638576226183992">"<xliff:g id="APP_NAME">%1$s</xliff:g> will be allowed to interact with your notifications and stream your apps to the connected device."</string>
-    <string name="role_companion_device_computer_description" msgid="416099879217066377">"This service shares your photos, media and notifications from your phone to other devices."</string>
+    <string name="role_companion_device_computer_description" msgid="416099879217066377">"This service shares your photos, media, and notifications from your phone to other devices."</string>
     <string name="request_role_current_default" msgid="738722892438247184">"Current default"</string>
-    <string name="request_role_dont_ask_again" msgid="3556017886029520306">"Don\'t ask again"</string>
+    <string name="request_role_dont_ask_again" msgid="3556017886029520306">"Don’t ask again"</string>
     <string name="request_role_set_as_default" msgid="4253949643984172880">"Set as default"</string>
     <string name="phone_call_uses_microphone" msgid="233569591461187177">"Microphone is used in &lt;b&gt;phone call&lt;/b&gt;"</string>
-    <string name="phone_call_uses_microphone_and_camera" msgid="6291898755681748189">"Camera and microphone are used in &lt;b&gt;video call&lt;/b&gt;"</string>
+    <string name="phone_call_uses_microphone_and_camera" msgid="6291898755681748189">"Camera and Microphone are used in &lt;b&gt;video call&lt;/b&gt;"</string>
     <string name="phone_call_uses_camera" msgid="2048417022147857418">"Camera is used in &lt;b&gt;video call&lt;/b&gt;"</string>
     <string name="system_uses_microphone" msgid="576672130318877143">"Microphone is accessed using system service"</string>
-    <string name="system_uses_microphone_and_camera" msgid="5124478304275138804">"Camera and microphone are accessed using system service"</string>
+    <string name="system_uses_microphone_and_camera" msgid="5124478304275138804">"Camera and Microphone are accessed using system service"</string>
     <string name="system_uses_camera" msgid="1911223105234441470">"Camera is accessed using system service"</string>
     <string name="other_use" msgid="6564855051022776692">"Other use:"</string>
-    <string name="ongoing_usage_dialog_ok" msgid="103556809118460072">"OK"</string>
+    <string name="ongoing_usage_dialog_ok" msgid="103556809118460072">"Got it"</string>
     <string name="ongoing_usage_dialog_title" msgid="683836493556628569">"Recent use of <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
-    <string name="ongoing_usage_dialog_title_mic" msgid="5966714811125593992">"Recent use of microphone"</string>
+    <string name="ongoing_usage_dialog_title_mic" msgid="5966714811125593992">"Recent use of Microphone"</string>
     <string name="ongoing_usage_dialog_title_camera" msgid="7819329688650711470">"Recent use of Camera"</string>
-    <string name="ongoing_usage_dialog_title_mic_camera" msgid="9079747867228772797">"Recent use of microphone &amp; Camera"</string>
+    <string name="ongoing_usage_dialog_title_mic_camera" msgid="9079747867228772797">"Recent use of Microphone &amp; Camera"</string>
     <string name="ongoing_usage_dialog_separator" msgid="1715181526581520068">", "</string>
     <string name="ongoing_usage_dialog_last_separator" msgid="4170995004748832163">" and "</string>
     <string name="default_app_search_keyword" msgid="8330125736889689743">"default apps"</string>
-    <string name="permgroup_list_microphone_and_camera" msgid="962768198001487969">"Microphone and Camera"</string>
+    <string name="permgroup_list_microphone_and_camera" msgid="962768198001487969">"Microphone &amp; Camera"</string>
     <string name="settings_button" msgid="4414988414732479636">"Settings"</string>
     <string name="default_apps" msgid="5119201969348748639">"Default apps"</string>
     <string name="no_default_apps" msgid="2593466527182950231">"No default apps"</string>
@@ -407,20 +407,20 @@
     <string name="default_app_system_default" msgid="6218386768175513760">"(System default)"</string>
     <string name="default_app_no_apps" msgid="115720991680586885">"No apps"</string>
     <string name="car_default_app_selected" msgid="5416420830430644174">"Selected"</string>
-    <string name="car_default_app_selected_with_info" msgid="1932204186080593500">"Selected – <xliff:g id="ADDITIONAL_INFO">%1$s</xliff:g>"</string>
+    <string name="car_default_app_selected_with_info" msgid="1932204186080593500">"Selected - <xliff:g id="ADDITIONAL_INFO">%1$s</xliff:g>"</string>
     <string name="special_app_access_search_keyword" msgid="8032347212290774210">"special app access"</string>
     <string name="special_app_access" msgid="5019319067120213797">"Special app access"</string>
     <string name="no_special_app_access" msgid="6950277571805106247">"No special app access"</string>
     <string name="special_app_access_no_apps" msgid="4102911722787886970">"No apps"</string>
     <string name="home_missing_work_profile_support" msgid="1756855847669387977">"Doesn’t support work profile"</string>
     <string name="encryption_unaware_confirmation_message" msgid="8274491794636402484">"Note: If you restart your device and have a screen lock set, this app can’t start until you unlock your device."</string>
-    <string name="assistant_confirmation_message" msgid="7476540402884416212">"The assistant will be able to read information about apps that are in use on your system, including information visible on your screen or accessible within the apps."</string>
+    <string name="assistant_confirmation_message" msgid="7476540402884416212">"The assistant will be able to read information about apps in use on your system, including information visible on your screen or accessible within the apps."</string>
     <string name="incident_report_channel_name" msgid="3144954065936288440">"Share Debugging Data"</string>
     <string name="incident_report_notification_title" msgid="4635984625656519773">"Share detailed debugging data?"</string>
     <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> would like to upload debugging information."</string>
     <string name="incident_report_dialog_title" msgid="669104389325204095">"Share debugging data?"</string>
     <string name="incident_report_dialog_intro" msgid="5897733669850951832">"The system has detected a problem."</string>
-    <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> would like to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or data logged by apps, such as user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information. Allow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string>
+    <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information. Allow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string>
     <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"There was an error processing the bug report for <xliff:g id="APP_NAME">%1$s</xliff:g>. So sharing the detailed debugging data has been denied. Sorry for the interruption."</string>
     <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Allow"</string>
     <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Deny"</string>
@@ -438,18 +438,18 @@
     <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access this device’s location?"</string>
     <string name="permgroupbackgroundrequestdetail_location" msgid="8021219324989662957">"This app may want to access your location all the time, even when you’re not using the app. "<annotation id="link">"Allow in settings."</annotation></string>
     <string name="permgroupupgraderequest_location" msgid="8328408946822691636">"Change location access for &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;?"</string>
-    <string name="permgroupupgraderequestdetail_location" msgid="1550899076845189165">"This app wants to access your location all the time, even when you’re not using the app. "<annotation id="link">"Allow in Settings."</annotation></string>
-    <string name="permgrouprequest_nearby_devices" msgid="2272829282660436700">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to find, connect to and determine the relative position of nearby devices?"</string>
-    <string name="permgroupupgraderequestdetail_nearby_devices" msgid="6877531270654738614">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to find, connect to and determine the relative position of nearby devices? "<annotation id="link">"Allow in settings."</annotation></string>
+    <string name="permgroupupgraderequestdetail_location" msgid="1550899076845189165">"This app wants to access your location all the time, even when you’re not using the app. "<annotation id="link">"Allow in settings."</annotation></string>
+    <string name="permgrouprequest_nearby_devices" msgid="2272829282660436700">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to find, connect to, and determine the relative position of nearby devices?"</string>
+    <string name="permgroupupgraderequestdetail_nearby_devices" msgid="6877531270654738614">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to find, connect to, and determine the relative position of nearby devices? "<annotation id="link">"Allow in settings."</annotation></string>
     <string name="permgrouprequest_fineupgrade" msgid="2334242928821697672">"Change <xliff:g id="APP_NAME">&lt;b&gt;%1$s&lt;/b&gt;</xliff:g>’s location access from approximate to precise?"</string>
     <string name="permgrouprequest_coarselocation" msgid="7244605063736425232">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access this device’s approximate location?"</string>
     <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"Precise"</string>
     <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"Approximate"</string>
     <string name="permgrouprequest_calendar" msgid="1493150855673603806">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access your calendar?"</string>
     <string name="permgrouprequest_sms" msgid="5672063688745420991">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to send and view SMS messages?"</string>
-    <string name="permgrouprequest_storage" msgid="8717773092518621602">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access photos, media and files on your device?"</string>
-    <string name="permgrouprequest_storage_q_to_s" msgid="8213701872983685505">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access &lt;b&gt;photos, videos, music and audio&lt;/b&gt; on this device?"</string>
-    <string name="permgrouprequest_storage_pre_q" msgid="168130651144569428">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access &lt;b&gt;photos, videos, music, audio and other files&lt;/b&gt; on this device?"</string>
+    <string name="permgrouprequest_storage" msgid="8717773092518621602">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access photos, media, and files on your device?"</string>
+    <string name="permgrouprequest_storage_q_to_s" msgid="8213701872983685505">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access &lt;b&gt;photos, videos, music, and audio&lt;/b&gt; on this device?"</string>
+    <string name="permgrouprequest_storage_pre_q" msgid="168130651144569428">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access &lt;b&gt;photos, videos, music, audio, and other files&lt;/b&gt; on this device?"</string>
     <string name="permgrouprequest_read_media_aural" msgid="2593365397347577812">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access music and audio on this device?"</string>
     <string name="permgrouprequest_read_media_visual" msgid="5548780620779729975">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access photos and videos on this device?"</string>
     <string name="permgrouprequest_microphone" msgid="2825208549114811299">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to record audio?"</string>
@@ -468,10 +468,10 @@
     <string name="permgrouprequest_calllog" msgid="2065327180175371397">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access your phone call logs?"</string>
     <string name="permgrouprequest_phone" msgid="1829234136997316752">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to make and manage phone calls?"</string>
     <string name="permgrouprequest_sensors" msgid="4397358316850652235">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access sensor data about your vital signs?"</string>
-    <string name="permgroupupgraderequestdetail_sensors" msgid="6651914048792092835">"This app wants to access sensor data about your vital signs all the time, even when you’re not using the app. To make this change, "<annotation id="link">"go to Settings."</annotation></string>
+    <string name="permgroupupgraderequestdetail_sensors" msgid="6651914048792092835">"This app wants to access sensor data about your vital signs all the time, even when you’re not using the app. To make this change, "<annotation id="link">"go to settings."</annotation></string>
     <string name="permgroupbackgroundrequest_sensors" msgid="5661924322018503886">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access the sensor data about your vital signs?"</string>
     <string name="permgroupbackgroundrequestdetail_sensors" msgid="7726767635834043501">"To let this app access body sensor data all the time, even when you’re not using the app, "<annotation id="link">"go to settings."</annotation></string>
-    <string name="permgroupupgraderequest_sensors" msgid="7576527638411370468">"Keep allowing &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access body sensor data while the app is in use?"</string>
+    <string name="permgroupupgraderequest_sensors" msgid="7576527638411370468">"Keep allowing &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to access body sensor data while app is in use?"</string>
     <string name="permgrouprequest_notifications" msgid="6396739062335106181">"Allow &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; to send you notifications?"</string>
     <string name="auto_granted_permissions" msgid="6009452264824455892">"Controlled permissions"</string>
     <string name="auto_granted_location_permission_notification_title" msgid="1438871159268985993">"Location can be accessed"</string>
@@ -496,12 +496,12 @@
     <string name="blocked_sensor_summary" msgid="4443707628305027375">"For apps and services"</string>
     <string name="blocked_mic_summary" msgid="8960466941528458347">"Microphone data may still be shared when you call an emergency number."</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"Change"</string>
-    <string name="safety_center_dashboard_page_title" msgid="7514620345152008005">"Security and privacy"</string>
+    <string name="safety_center_dashboard_page_title" msgid="7514620345152008005">"Security &amp; Privacy"</string>
     <string name="safety_center_rescan_button" msgid="8047036829052958144">"Scan"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Dismiss"</string>
-    <string name="security_settings" msgid="3808106921175271317">"Security settings"</string>
-    <string name="sensor_permissions_qs" msgid="4365989229426201877">"Sensor permissions"</string>
-    <string name="privacy_controls_qs" msgid="471793881466080745">"Privacy controls"</string>
+    <string name="security_settings" msgid="3808106921175271317">"Security Settings"</string>
+    <string name="sensor_permissions_qs" msgid="4365989229426201877">"Sensor Permissions"</string>
+    <string name="privacy_controls_qs" msgid="471793881466080745">"Privacy Controls"</string>
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Permission removed"</string>
     <string name="camera_usage_qs" msgid="7943349178368641820">"See more camera usage"</string>
     <string name="microphone_usage_qs" msgid="2393193350541830472">"See more microphone usage"</string>
@@ -517,7 +517,7 @@
     <string name="recent_app_usage_1_qs" msgid="261450184773310741">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>)"</string>
     <string name="active_app_usage_2_qs" msgid="6107866785243565283">"Being used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
     <string name="recent_app_usage_2_qs" msgid="3591205954235694403">"Recently used by <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>)"</string>
-    <string name="safety_privacy_qs_tile_title" msgid="5431148204168066203">"Security and privacy"</string>
+    <string name="safety_privacy_qs_tile_title" msgid="5431148204168066203">"Security &amp; Privacy"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Check status"</string>
     <string name="media_confirm_dialog_positive_button" msgid="9020793594051526399">"Confirm"</string>
     <string name="media_confirm_dialog_negative_button" msgid="226987376924861785">"Back"</string>
@@ -529,10 +529,10 @@
     <string name="media_confirm_dialog_title_q_to_s_aural_deny" msgid="3128147568953297969">"Access to photos and videos also won’t be allowed"</string>
     <string name="media_confirm_dialog_title_q_to_s_visual_allow" msgid="6310682466493330434">"Access to music and audio files will also be allowed"</string>
     <string name="media_confirm_dialog_title_q_to_s_visual_deny" msgid="1123845663785900471">"Access to music and audio files also won’t be allowed"</string>
-    <string name="media_confirm_dialog_message_a_to_p_aural_allow" msgid="7865167246140107623">"This app doesn’t support the latest version of Android. If this app can access music and audio files, it will also be allowed to access photos, videos and other files."</string>
-    <string name="media_confirm_dialog_message_a_to_p_aural_deny" msgid="287502523664804786">"This app doesn’t support the latest version of Android. If this app can’t access music and audio files, it also won’t be allowed to access photos, videos and other files."</string>
-    <string name="media_confirm_dialog_message_a_to_p_visual_allow" msgid="4952410892939590487">"This app doesn’t support the latest version of Android. If this app can access photos and videos, it will also be allowed to access music, audio and other files."</string>
-    <string name="media_confirm_dialog_message_a_to_p_visual_deny" msgid="6609500525590757681">"This app doesn’t support the latest version of Android. If this app can’t access photos and videos, it also won’t be allowed to access music, audio and other files."</string>
+    <string name="media_confirm_dialog_message_a_to_p_aural_allow" msgid="7865167246140107623">"This app doesn’t support the latest version of Android. If this app can access music and audio files, it will also be allowed to access photos, videos, and other files."</string>
+    <string name="media_confirm_dialog_message_a_to_p_aural_deny" msgid="287502523664804786">"This app doesn’t support the latest version of Android. If this app can’t access music and audio files, it also won’t be allowed to access photos, videos, and other files."</string>
+    <string name="media_confirm_dialog_message_a_to_p_visual_allow" msgid="4952410892939590487">"This app doesn’t support the latest version of Android. If this app can access photos and videos, it will also be allowed to access music, audio, and other files."</string>
+    <string name="media_confirm_dialog_message_a_to_p_visual_deny" msgid="6609500525590757681">"This app doesn’t support the latest version of Android. If this app can’t access photos and videos, it also won’t be allowed to access music, audio, other files."</string>
     <string name="media_confirm_dialog_message_q_to_s_aural_allow" msgid="1702402580147536160">"This app doesn’t support the latest version of Android. If this app can access music and audio files, it will also be allowed to access photos and videos."</string>
     <string name="media_confirm_dialog_message_q_to_s_aural_deny" msgid="6832087393653561911">"This app doesn’t support the latest version of Android. If this app can’t access music and audio files, it also won’t be allowed to access photos and videos."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_allow" msgid="3504335060843147760">"This app doesn’t support the latest version of Android. If this app can access photos and videos, it will also be allowed to access music and audio files."</string>
diff --git a/PermissionController/res/values-en-rGB/strings.xml b/PermissionController/res/values-en-rGB/strings.xml
index cfe0f10..ecc0175 100644
--- a/PermissionController/res/values-en-rGB/strings.xml
+++ b/PermissionController/res/values-en-rGB/strings.xml
@@ -26,7 +26,7 @@
     <string name="uninstall_or_disable" msgid="4496612999740858933">"Uninstall or disable"</string>
     <string name="app_not_found_dlg_title" msgid="6029482906093859756">"App not found"</string>
     <string name="grant_dialog_button_deny" msgid="88262611492697192">"Don\'t allow"</string>
-    <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow &amp; don’t ask again"</string>
+    <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow and don’t ask again"</string>
     <string name="grant_dialog_button_no_upgrade" msgid="8344732743633736625">"Keep \'While the app is in use\'"</string>
     <string name="grant_dialog_button_no_upgrade_one_time" msgid="5125892775684968694">"Keep \'Only this time\'"</string>
     <string name="grant_dialog_button_more_info" msgid="213350268561945193">"More info"</string>
diff --git a/PermissionController/res/values-en-rIN/strings.xml b/PermissionController/res/values-en-rIN/strings.xml
index cfe0f10..ecc0175 100644
--- a/PermissionController/res/values-en-rIN/strings.xml
+++ b/PermissionController/res/values-en-rIN/strings.xml
@@ -26,7 +26,7 @@
     <string name="uninstall_or_disable" msgid="4496612999740858933">"Uninstall or disable"</string>
     <string name="app_not_found_dlg_title" msgid="6029482906093859756">"App not found"</string>
     <string name="grant_dialog_button_deny" msgid="88262611492697192">"Don\'t allow"</string>
-    <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow &amp; don’t ask again"</string>
+    <string name="grant_dialog_button_deny_and_dont_ask_again" msgid="1748925431574312595">"Don’t allow and don’t ask again"</string>
     <string name="grant_dialog_button_no_upgrade" msgid="8344732743633736625">"Keep \'While the app is in use\'"</string>
     <string name="grant_dialog_button_no_upgrade_one_time" msgid="5125892775684968694">"Keep \'Only this time\'"</string>
     <string name="grant_dialog_button_more_info" msgid="213350268561945193">"More info"</string>
diff --git a/PermissionController/res/values-es/strings.xml b/PermissionController/res/values-es/strings.xml
index d1b2162..f3e702e 100644
--- a/PermissionController/res/values-es/strings.xml
+++ b/PermissionController/res/values-es/strings.xml
@@ -244,7 +244,7 @@
     <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"Denegado / Último acceso: Nunca"</string>
     <string name="allowed_header" msgid="7769277978004790414">"Permitido"</string>
     <string name="allowed_always_header" msgid="6455903312589013545">"Permitido siempre"</string>
-    <string name="allowed_foreground_header" msgid="6845655788447833353">"Permitido solo mientras se usa"</string>
+    <string name="allowed_foreground_header" msgid="6845655788447833353">"Permitidas solo mientras se usan"</string>
     <string name="allowed_storage_scoped" msgid="5383645873719086975">"Pueden acceder solo al contenido multimedia"</string>
     <string name="allowed_storage_full" msgid="5356699280625693530">"Pueden gestionar todos los archivos"</string>
     <string name="ask_header" msgid="2633816846459944376">"Preguntar siempre"</string>
diff --git a/PermissionController/res/values-fi/strings.xml b/PermissionController/res/values-fi/strings.xml
index 0789479..09d89c0 100644
--- a/PermissionController/res/values-fi/strings.xml
+++ b/PermissionController/res/values-fi/strings.xml
@@ -184,7 +184,7 @@
     <string name="app_permission_button_allow_all_files" msgid="1792232272599018825">"Salli kaikkien tiedostojen ylläpito"</string>
     <string name="app_permission_button_allow_media_only" msgid="2834282724426046154">"Salli pääsy vain mediaan"</string>
     <string name="app_permission_button_allow_always" msgid="4573292371734011171">"Salli aina"</string>
-    <string name="app_permission_button_allow_foreground" msgid="1991570451498943207">"Salli vain, kun sovellus on käytössä"</string>
+    <string name="app_permission_button_allow_foreground" msgid="1991570451498943207">"Salli vain käytön aikana"</string>
     <string name="app_permission_button_ask" msgid="3342950658789427">"Kysy aina"</string>
     <string name="app_permission_button_deny" msgid="6016454069832050300">"Älä salli"</string>
     <string name="precise_image_description" msgid="6349638632303619872">"Tarkka sijainti"</string>
diff --git a/PermissionController/res/values-gu-television/strings.xml b/PermissionController/res/values-gu-television/strings.xml
index a382722..5fde391 100644
--- a/PermissionController/res/values-gu-television/strings.xml
+++ b/PermissionController/res/values-gu-television/strings.xml
@@ -20,8 +20,8 @@
     <string name="grant_dialog_how_to_change" msgid="997462845048160559">"તમે થોડા સમય પછી આને સેટિંગ &gt; ઍપમાં બદલી શકો છો"</string>
     <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>
     <string name="preference_show_system_apps" msgid="4262140518693221093">"સિસ્ટમ ઍપ બતાવો"</string>
-    <string name="app_permissions_decor_title" msgid="7438716722786036814">"ઍપ પરવાનગીઓ"</string>
-    <string name="manage_permissions_decor_title" msgid="4138423885439613577">"ઍપ પરવાનગીઓ"</string>
+    <string name="app_permissions_decor_title" msgid="7438716722786036814">"ઍપની પરવાનગીઓ"</string>
+    <string name="manage_permissions_decor_title" msgid="4138423885439613577">"ઍપની પરવાનગીઓ"</string>
     <string name="permission_apps_decor_title" msgid="2811550489429789828">"<xliff:g id="PERMISSION">%1$s</xliff:g> પરવાનગીઓ"</string>
     <string name="additional_permissions_decor_title" msgid="5113847982502484225">"વધારાની પરવાનગીઓ"</string>
     <string name="system_apps_decor_title" msgid="4402004958937474803">"<xliff:g id="PERMISSION">%1$s</xliff:g> પરવાનગીઓ"</string>
diff --git a/PermissionController/res/values-gu/strings.xml b/PermissionController/res/values-gu/strings.xml
index 8e3f7db..276495b 100644
--- a/PermissionController/res/values-gu/strings.xml
+++ b/PermissionController/res/values-gu/strings.xml
@@ -51,7 +51,7 @@
     <string name="grant_dialog_button_allow_all_files" msgid="4955436994954829894">"બધી ફાઇલો મેનેજ કરવાની મંજૂરી આપો"</string>
     <string name="grant_dialog_button_allow_media_only" msgid="4832877658422573832">"મીડિયા ફાઇલો ઍક્સેસ કરવાની મંજૂરી આપો"</string>
     <string name="app_permissions_breadcrumb" msgid="5136969550489411650">"ઍપ"</string>
-    <string name="app_permissions" msgid="3369917736607944781">"ઍપ પરવાનગીઓ"</string>
+    <string name="app_permissions" msgid="3369917736607944781">"ઍપની પરવાનગીઓ"</string>
     <string name="unused_apps" msgid="2058057455175955094">"ન વપરાયેલી ઍપ"</string>
     <string name="no_unused_apps" msgid="12809387670415295">"કોઈ બિનવપરાયેલી ઍપ નથી"</string>
     <string name="zero_unused_apps" msgid="9024448554157499748">"બિનવપરાયેલી 0 ઍપ"</string>
diff --git a/PermissionController/res/values-hi/strings.xml b/PermissionController/res/values-hi/strings.xml
index af7653f..a144a65 100644
--- a/PermissionController/res/values-hi/strings.xml
+++ b/PermissionController/res/values-hi/strings.xml
@@ -431,7 +431,7 @@
     <string name="adjust_user_sensitive_per_app_header" msgid="4543506440989005648">"आगे दी गई चीज़ों का इस्तेमाल हाइलाइट करें"</string>
     <string name="assistant_record_audio_user_sensitive_title" msgid="5532123360322362378">"असिस्टेंट ऐप्लिकेशन का माइक्रोफ़ोन चालू है या बंद, इसकी सूचना दिखाएं"</string>
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6482937591816401619">"आवाज़ से डिवाइस का इस्तेमाल करने के लिए, माइक्रोफ़ोन का इस्तेमाल करते समय स्थिति बार में आइकॉन दिखाएं"</string>
-    <string name="permgrouprequest_storage_isolated" msgid="4892154224026852295">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को अपने डिवाइस में मौजूद फ़ोटो और मीडिया ऐक्सेस करने की अनुमति देना चाहते हैं?"</string>
+    <string name="permgrouprequest_storage_isolated" msgid="4892154224026852295">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को अपने डिवाइस में मौजूद फ़ोटो और मीडिया ऐक्सेस करने की अनुमति देनी है?"</string>
     <string name="permgrouprequest_contacts" msgid="8391550064551053695">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को अपने संपर्क देखने की अनुमति देनी है?"</string>
     <string name="permgrouprequest_location" msgid="6990232580121067883">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को इस डिवाइस की जगह की जानकारी ऐक्सेस करने की अनुमति देनी है?"</string>
     <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"ऐप्लिकेशन, डिवाइस की जगह की जानकारी सिर्फ़ तभी देख पाएगा जब आप इसका इस्तेमाल कर रहे हों"</string>
@@ -472,7 +472,7 @@
     <string name="permgroupbackgroundrequest_sensors" msgid="5661924322018503886">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को अपने शरीर के बारे में जानकारी देने वाले लक्षणों के सेंसर डेटा को ऐक्सेस करने की अनुमति दें?"</string>
     <string name="permgroupbackgroundrequestdetail_sensors" msgid="7726767635834043501">"इस ऐप्लिकेशन का इस्तेमाल न किए जाने पर भी, इसे बॉडी सेंसर के डेटा को हमेशा ऐक्सेस करने की अनुमति देने के लिए, "<annotation id="link">"सेटिंग पर जाएं."</annotation></string>
     <string name="permgroupupgraderequest_sensors" msgid="7576527638411370468">"क्या इस्तेमाल के दौरान, &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को बॉडी सेंसर के डेटा का ऐक्सेस देते रहना है?"</string>
-    <string name="permgrouprequest_notifications" msgid="6396739062335106181">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को, आपको सूचनाएं भेजने की अनुमति देनी है?"</string>
+    <string name="permgrouprequest_notifications" msgid="6396739062335106181">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; को सूचनाएं भेजने की अनुमति दें?"</string>
     <string name="auto_granted_permissions" msgid="6009452264824455892">"कंट्रोल की गई अनुमतियां"</string>
     <string name="auto_granted_location_permission_notification_title" msgid="1438871159268985993">"जगह की जानकारी देखी जा सकती है"</string>
     <string name="auto_granted_permission_notification_body" msgid="6919835973190443695">"आपका आईटी एडमिन <xliff:g id="APP_NAME">%s</xliff:g> को आपकी जगह की जानकारी देखने की अनुमति दे रहा है"</string>
diff --git a/PermissionController/res/values-it/strings.xml b/PermissionController/res/values-it/strings.xml
index 46e5337..72864ab 100644
--- a/PermissionController/res/values-it/strings.xml
+++ b/PermissionController/res/values-it/strings.xml
@@ -497,7 +497,7 @@
     <string name="blocked_mic_summary" msgid="8960466941528458347">"I dati del microfono potrebbero comunque essere condivisi quando chiami un numero di emergenza."</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"Cambia"</string>
     <string name="safety_center_dashboard_page_title" msgid="7514620345152008005">"Sicurezza e privacy"</string>
-    <string name="safety_center_rescan_button" msgid="8047036829052958144">"Cerca"</string>
+    <string name="safety_center_rescan_button" msgid="8047036829052958144">"Analizza"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Ignora"</string>
     <string name="security_settings" msgid="3808106921175271317">"Impostazioni di sicurezza"</string>
     <string name="sensor_permissions_qs" msgid="4365989229426201877">"Autorizzaz. accesso ai sensori"</string>
diff --git a/PermissionController/res/values-iw/strings.xml b/PermissionController/res/values-iw/strings.xml
index 0076015..b7daf40 100644
--- a/PermissionController/res/values-iw/strings.xml
+++ b/PermissionController/res/values-iw/strings.xml
@@ -61,7 +61,7 @@
     <string name="auto_permission_manager_summary" msgid="9157438376234301354">"ניהול של נתוני הגישה ליומן, ליומני השיחות ועוד"</string>
     <string name="granted_permission_decision" msgid="7824827491551861365">"הסכמת להעניק לאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> גישה אל <xliff:g id="PERMISSION_NAME">%2$s</xliff:g>"</string>
     <string name="denied_permission_decision" msgid="5308961501779563781">"סירבת להעניק לאפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> גישה אל <xliff:g id="PERMISSION_NAME">%2$s</xliff:g>"</string>
-    <string name="days_ago" msgid="6650359081551335629">"{count,plural, =0{היום}=1{אתמול}two{שלשום}many{לפני # ימים}other{לפני # ימים}}"</string>
+    <string name="days_ago" msgid="6650359081551335629">"{count,plural, =0{היום}=1{אתמול}one{לפני # ימים}two{שלשום}other{לפני # ימים}}"</string>
     <string name="app_disable_dlg_positive" msgid="7418444149981904940">"השבתת האפליקציה"</string>
     <string name="app_disable_dlg_text" msgid="3126943217146120240">"‏אם האפליקציה הזו תושבת, ייתכן ש-Android ואפליקציות אחרות לא יפעלו כצפוי. חשוב לזכור שלא ניתן למחוק את האפליקציה, כי היא הותקנה מראש במכשיר. ההשבתה מכבה את האפליקציה ומסתירה אותה במכשיר."</string>
     <string name="app_permission_manager" msgid="3903811137630909550">"מנהל ההרשאות"</string>
@@ -69,7 +69,7 @@
     <string name="no_permissions" msgid="3881676756371148563">"אין הרשאות"</string>
     <string name="additional_permissions" msgid="5801285469338873430">"הרשאות נוספות"</string>
     <string name="app_permissions_info_button_label" msgid="7633312050729974623">"פתיחה של פרטי האפליקציה"</string>
-    <string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{עוד אחת}two{עוד #}many{עוד #}other{עוד #}}"</string>
+    <string name="additional_permissions_more" msgid="5681220714755304407">"{count,plural, =1{עוד אחת}one{עוד #}two{עוד #}other{עוד #}}"</string>
     <string name="old_sdk_deny_warning" msgid="2382236998845153919">"‏האפליקציה הזו תוכננה לגרסה ישנה יותר של Android. דחיית ההרשאה עשויה לגרום לה לתפקד בצורה לקויה."</string>
     <string name="storage_supergroup_warning_allow" msgid="103093462784523190">"‏האפליקציה הזו מיועדת לגרסה ישנה יותר של Android. בחירה לתת לה את ההרשאה הזו תפתח לה גישה לכל הקבצים ששמורים באחסון (כולל תמונות, סרטונים, מוזיקה, אודיו וקבצים אחרים)."</string>
     <string name="storage_supergroup_warning_deny" msgid="6420765672683284347">"‏האפליקציה הזו מיועדת לגרסה ישנה יותר של Android. אם לא תינתן לה ההרשאה הזו, לא תהיה לה גישה לכל הקבצים ששמורים באחסון (כולל תמונות, סרטונים, מוזיקה, אודיו וקבצים אחרים)."</string>
@@ -134,10 +134,10 @@
     <string name="auto_permission_usage_timeline_summary" msgid="2713135806453218703">"<xliff:g id="ACCESS_TIME">%1$s</xliff:g> • <xliff:g id="SUMMARY_TEXT">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_2" msgid="1521763591164293683">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_3" msgid="758761785983094351">"<xliff:g id="ATTRIBUTION_NAME">%1$s</xliff:g> • <xliff:g id="APP_NAME">%2$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%3$s</xliff:g>"</string>
-    <string name="duration_used_days" msgid="8293010131040301793">"{count,plural, =1{יום אחד}two{יומיים}many{# ימים}other{# ימים}}"</string>
-    <string name="duration_used_hours" msgid="1128716208752263576">"{count,plural, =1{שעה אחת}two{שעתיים}many{# שעות}other{# שעות}}"</string>
-    <string name="duration_used_minutes" msgid="5335824115042576567">"{count,plural, =1{דקה אחת}two{# דקות}many{# דקות}other{# דקות}}"</string>
-    <string name="duration_used_seconds" msgid="6543746449171675028">"{count,plural, =1{שנייה אחת}two{# שניות}many{# שניות}other{# שניות}}"</string>
+    <string name="duration_used_days" msgid="8293010131040301793">"{count,plural, =1{יום אחד}one{# ימים}two{יומיים}other{# ימים}}"</string>
+    <string name="duration_used_hours" msgid="1128716208752263576">"{count,plural, =1{שעה אחת}one{# שעות}two{שעתיים}other{# שעות}}"</string>
+    <string name="duration_used_minutes" msgid="5335824115042576567">"{count,plural, =1{דקה אחת}one{# דקות}two{# דקות}other{# דקות}}"</string>
+    <string name="duration_used_seconds" msgid="6543746449171675028">"{count,plural, =1{שנייה אחת}one{# שניות}two{# שניות}other{# שניות}}"</string>
     <string name="permission_usage_any_permission" msgid="6358023078298106997">"כל הרשאה שהיא"</string>
     <string name="permission_usage_any_time" msgid="3802087027301631827">"בכל עת"</string>
     <string name="permission_usage_last_7_days" msgid="7386221251886130065">"7 הימים האחרונים"</string>
@@ -160,7 +160,7 @@
     <string name="permission_usage_bar_chart_title_last_minute" msgid="820450867183487607">"שימוש בהרשאות בדקה האחרונה"</string>
     <string name="permission_usage_preference_summary_not_used_24h" msgid="3087783232178611025">"לא נעשה שימוש ב-24 השעות האחרונות"</string>
     <string name="permission_usage_preference_summary_not_used_7d" msgid="4592301300810120096">"לא נעשה שימוש ב-7 הימים האחרונים"</string>
-    <string name="permission_usage_preference_label" msgid="8343167938128676378">"{count,plural, =1{בשימוש על ידי אפליקציה אחת}two{בשימוש על ידי # אפליקציות}many{בשימוש על ידי # אפליקציות}other{בשימוש על ידי # אפליקציות}}"</string>
+    <string name="permission_usage_preference_label" msgid="8343167938128676378">"{count,plural, =1{בשימוש על ידי אפליקציה אחת}one{בשימוש על ידי # אפליקציות}two{בשימוש על ידי # אפליקציות}other{בשימוש על ידי # אפליקציות}}"</string>
     <string name="permission_usage_view_details" msgid="6675335735468752787">"הצגת כל הפרטים במרכז השליטה"</string>
     <string name="app_permission_usage_filter_label" msgid="7182861154638631550">"סינון לפי: <xliff:g id="PERM">%1$s</xliff:g>"</string>
     <string name="app_permission_usage_remove_filter" msgid="2926157607436428207">"הסרת המסנן"</string>
@@ -250,23 +250,23 @@
     <string name="ask_header" msgid="2633816846459944376">"יש לשאול בכל פעם"</string>
     <string name="denied_header" msgid="903209608358177654">"אין הרשאה"</string>
     <string name="storage_footer_hyperlink_text" msgid="8873343987957834810">"לצפייה באפליקציות נוספות שיכולות לגשת לכל הקבצים"</string>
-    <string name="days" msgid="609563020985571393">"{count,plural, =1{יום אחד}two{יומיים}many{# ימים}other{# ימים}}"</string>
-    <string name="hours" msgid="3447767892295843282">"{count,plural, =1{שעה אחת}two{שעתיים}many{# שעות}other{# שעות}}"</string>
-    <string name="minutes" msgid="4408293038068503157">"{count,plural, =1{דקה אחת}two{# דקות}many{# דקות}other{# דקות}}"</string>
-    <string name="seconds" msgid="5397771912131132690">"{count,plural, =1{שנייה אחת}two{# שניות}many{# שניות}other{# שניות}}"</string>
+    <string name="days" msgid="609563020985571393">"{count,plural, =1{יום אחד}one{# ימים}two{יומיים}other{# ימים}}"</string>
+    <string name="hours" msgid="3447767892295843282">"{count,plural, =1{שעה אחת}one{# שעות}two{שעתיים}other{# שעות}}"</string>
+    <string name="minutes" msgid="4408293038068503157">"{count,plural, =1{דקה אחת}one{# דקות}two{# דקות}other{# דקות}}"</string>
+    <string name="seconds" msgid="5397771912131132690">"{count,plural, =1{שנייה אחת}one{# שניות}two{# שניות}other{# שניות}}"</string>
     <string name="permission_reminders" msgid="6528257957664832636">"תזכורות להרשאות"</string>
     <string name="auto_revoke_permission_reminder_notification_title_one" msgid="6690347469376854137">"אפליקציה אחת שמזמן לא השתמשת בה"</string>
     <string name="auto_revoke_permission_reminder_notification_title_many" msgid="6062217713645069960">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> אפליקציות שמזמן לא השתמשת בהן"</string>
     <string name="auto_revoke_permission_reminder_notification_content" msgid="4492228990462107487">"הוסרו הרשאות כדי להגן על הפרטיות שלך. יש להקיש כדי לבדוק"</string>
     <string name="auto_revoke_permission_notification_title" msgid="2629844160853454657">"הוסרו הרשאות לאפליקציות שמזמן לא השתמשת בהן"</string>
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"יש אפליקציות שלא נעשה בהן שימוש כבר כמה חודשים. אפשר להקיש כדי לבדוק."</string>
-    <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{אפליקציה אחת שמזמן לא השתמשת בה}two{# אפליקציות שמזמן לא השתמשת בהן}many{# אפליקציות שמזמן לא השתמשת בהן}other{# אפליקציות שמזמן לא השתמשת בהן}}"</string>
+    <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{אפליקציה אחת שמזמן לא השתמשת בה}one{# אפליקציות שמזמן לא השתמשת בהן}two{# אפליקציות שמזמן לא השתמשת בהן}other{# אפליקציות שמזמן לא השתמשת בהן}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"ההרשאות בוטלו, הקבצים הזמניים הוסרו וההתראות הופסקו. יש להקיש כדי לבדוק."</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"בדיקת ההרשאות שניתנו לאחרונה"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"במהלך הנהיגה, נתת לאפליקציה <xliff:g id="APP">%1$s</xliff:g> גישה ל<xliff:g id="PERMISSION">%2$s</xliff:g>"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions" msgid="671791184670801301">"במהלך הנהיגה, נתת לאפליקציה <xliff:g id="APP">%1$s</xliff:g> גישה ל<xliff:g id="PERMISSION_1">%2$s</xliff:g> ול<xliff:g id="PERMISSION_2">%3$s</xliff:g>"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_multi_permission" msgid="4080701771111456927">"במהלך הנהיגה, הענקת <xliff:g id="COUNT">%1$d</xliff:g> הרשאות לאפליקציה <xliff:g id="APP">%2$s</xliff:g>"</string>
-    <string name="post_drive_permission_decision_reminder_summary_multi_apps" msgid="5253882771252863902">"{count,plural, =1{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_0">%1$s</xliff:g> ולאפליקציה אחת נוספת}two{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_1">%1$s</xliff:g> ול-# אפליקציות נוספות}many{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_1">%1$s</xliff:g> ול-# אפליקציות נוספות}other{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_1">%1$s</xliff:g> ול-# אפליקציות נוספות}}"</string>
+    <string name="post_drive_permission_decision_reminder_summary_multi_apps" msgid="5253882771252863902">"{count,plural, =1{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_0">%1$s</xliff:g> ולאפליקציה אחת נוספת}one{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_1">%1$s</xliff:g> ול-# אפליקציות נוספות}two{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_1">%1$s</xliff:g> ול-# אפליקציות נוספות}other{במהלך הנהיגה, נתת גישה לאפליקציה <xliff:g id="APP_1">%1$s</xliff:g> ול-# אפליקציות נוספות}}"</string>
     <string name="go_to_settings" msgid="1053735612211228335">"להגדרות"</string>
     <string name="auto_revoke_setting_subtitle" msgid="8631720570723050460">"יש אפליקציות שלא נעשה בהן שימוש כבר כמה חודשים"</string>
     <string name="permissions_removed_category_title" msgid="1064754271178447643">"ההרשאות שהוסרו"</string>
diff --git a/PermissionController/res/values-kk/strings.xml b/PermissionController/res/values-kk/strings.xml
index dd3b132..4d13c97 100644
--- a/PermissionController/res/values-kk/strings.xml
+++ b/PermissionController/res/values-kk/strings.xml
@@ -120,7 +120,7 @@
     <string name="current_permissions_category" msgid="4292990083585728880">"Ағымдағы рұқсаттар"</string>
     <string name="message_staging" msgid="9110563899955511866">"Қолданба реттелуде…"</string>
     <string name="app_name_unknown" msgid="1319665005754048952">"Белгісіз"</string>
-    <string name="permission_usage_title" msgid="1568233336351734538">"Құпиялылық тақтасы"</string>
+    <string name="permission_usage_title" msgid="1568233336351734538">"Құпиялық тақтасы"</string>
     <string name="auto_permission_usage_summary" msgid="7335667266743337075">"Қандай қолданбалар рұқсаттарды пайдаланғанын көріңіз."</string>
     <string name="permission_group_usage_title" msgid="2595013198075285173">"<xliff:g id="PERMGROUP">%1$s</xliff:g> рұқсатының пайдаланылуы"</string>
     <string name="perm_usage_adv_info_title" msgid="3357831829538873708">"Басқа рұқсаттарды көру"</string>
@@ -257,7 +257,7 @@
     <string name="permission_reminders" msgid="6528257957664832636">"Рұқсат туралы еске салғыштар"</string>
     <string name="auto_revoke_permission_reminder_notification_title_one" msgid="6690347469376854137">"1 пайдаланылмайтын қолданба"</string>
     <string name="auto_revoke_permission_reminder_notification_title_many" msgid="6062217713645069960">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> пайдаланылмайтын қолданба бар"</string>
-    <string name="auto_revoke_permission_reminder_notification_content" msgid="4492228990462107487">"Құпиялылықты қорғау үшін рұқсаттар өшірілді. Көру үшін түртіңіз."</string>
+    <string name="auto_revoke_permission_reminder_notification_content" msgid="4492228990462107487">"Құпиялықты қорғау үшін рұқсаттар өшірілді. Көру үшін түртіңіз."</string>
     <string name="auto_revoke_permission_notification_title" msgid="2629844160853454657">"Пайдаланылмайтын қолданбалар үшін рұқсаттар өшірілді"</string>
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"Кейбір қолданбалар бірнеше ай бойы пайдаланылмаған. Көру үшін түртіңіз."</string>
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# пайдаланылмайтын қолданба}other{# пайдаланылмайтын қолданба}}"</string>
@@ -273,16 +273,16 @@
     <string name="permission_removed_page_title" msgid="2627436155091001209">"Рұқсаттары өшірілген"</string>
     <string name="all_unused_apps_category_title" msgid="755663524704745414">"Барлық пайдаланылмайтын қолданбалар"</string>
     <string name="months_ago" msgid="1766026492610646354">"<xliff:g id="COUNT">%1$d</xliff:g> ай бұрын"</string>
-    <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"Құпиялылықты қорғау үшін рұқсаттар өшірілді."</string>
+    <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"Құпиялықты қорғау үшін рұқсаттар өшірілді."</string>
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> сіздің орналасқан жеріңізді фондық режимде анықтады."</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Бұл қолданба геодерегіңізді кез келген уақытта пайдалана алады. Өзгерту үшін түртіңіз."</string>
-    <string name="auto_revoke_after_notification_title" msgid="5417761027669887431">"Құпиялылықты сақтау үшін қолданба рұқсаттары өшірілді"</string>
+    <string name="auto_revoke_after_notification_title" msgid="5417761027669887431">"Құпиялықты сақтау үшін қолданба рұқсаттары өшірілді"</string>
     <string name="auto_revoke_after_notification_content_one" msgid="6804038707453662753">"<xliff:g id="APP_NAME">%s</xliff:g> қолданбасы бірнеше ай бойы пайдаланылмады. Көру үшін түртіңіз."</string>
     <string name="auto_revoke_after_notification_content_two" msgid="9108709764831425172">"<xliff:g id="APP_NAME">%s</xliff:g> және тағы 1 қолданба бірнеше ай бойы пайдаланылмады. Көру үшін түртіңіз."</string>
     <string name="auto_revoke_after_notification_content_many" msgid="4774106206289751220">"<xliff:g id="APP_NAME">%1$s</xliff:g> және тағы басқа <xliff:g id="NUMBER_OF_APPS">%2$s</xliff:g> қолданба бірнеше ай бойы пайдаланылмады. Көру үшін түртіңіз."</string>
     <string name="auto_revoke_before_notification_title_one" msgid="6758024954464359876">"1 қолданба пайдаланылмады"</string>
     <string name="auto_revoke_before_notification_title_many" msgid="4415543943846385685">"<xliff:g id="NUMBER_OF_APPS">%s</xliff:g> қолданба пайдаланылмады"</string>
-    <string name="auto_revoke_before_notification_content_one" msgid="1156635373417068822">"Құпиялылықты сақтау үшін қолданба рұқсаттары өшіріледі. Көру үшін түртіңіз."</string>
+    <string name="auto_revoke_before_notification_content_one" msgid="1156635373417068822">"Құпиялықты сақтау үшін қолданба рұқсаттары өшіріледі. Көру үшін түртіңіз."</string>
     <string name="unused_apps_title" msgid="8589298917717872239">"Пайдаланылмайтын қолданбалар"</string>
     <string name="unused_apps_subtitle_after" msgid="2034267519506357898">"Рұқсаттар келесі қолданбалардан өшірілді:"</string>
     <string name="unused_apps_subtitle_before" msgid="5233302577076132427">"Рұқсаттар келесі қолданбалардан өшіріледі:"</string>
@@ -488,20 +488,20 @@
     <string name="privdash_label_none" msgid="5991866260360484858">"Жоқ"</string>
     <string name="privdash_label_24h" msgid="1512532123865375319">"Соңғы\n24 сағатта"</string>
     <string name="privdash_label_7d" msgid="5645301995348656931">"Соңғы\n7 күн"</string>
-    <string name="exempt_mic_camera_info_label" msgid="6273581737010902815">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасын Android қорғайды. Деректеріңіз осы құрылғыда өңделетіндіктен, бұл қолданба рұқсатының пайдаланылуы күй жолағында немесе құпиялылық тақтасында көрсетілмейді."</string>
-    <string name="exempt_info_label" msgid="6286190981253476699">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасын Android қорғайды. Деректеріңіз осы құрылғыда өңделетіндіктен, бұл қолданба рұқсатының пайдаланылуы құпиялылық тақтасында көрсетілмейді."</string>
+    <string name="exempt_mic_camera_info_label" msgid="6273581737010902815">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасын Android қорғайды. Деректеріңіз осы құрылғыда өңделетіндіктен, бұл қолданба рұқсатының пайдаланылуы күй жолағында немесе құпиялық тақтасында көрсетілмейді."</string>
+    <string name="exempt_info_label" msgid="6286190981253476699">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасын Android қорғайды. Деректеріңіз осы құрылғыда өңделетіндіктен, бұл қолданба рұқсатының пайдаланылуы құпиялық тақтасында көрсетілмейді."</string>
     <string name="blocked_camera_title" msgid="1128510551791284384">"Құрылғы камерасы бөгелген"</string>
     <string name="blocked_microphone_title" msgid="1631517143648232585">"Құрылғы микрофоны бөгелген"</string>
     <string name="blocked_location_title" msgid="2005608279812892383">"Құрылғы геодерегі өшірулі"</string>
     <string name="blocked_sensor_summary" msgid="4443707628305027375">"Қолданбалар мен қызметтер үшін"</string>
     <string name="blocked_mic_summary" msgid="8960466941528458347">"Құтқару қызметінің нөміріне қоңырау шалу кезінде микрофон деректері әлі бөлісіліп жатуы мүмкін."</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"Өзгерту"</string>
-    <string name="safety_center_dashboard_page_title" msgid="7514620345152008005">"Қауіпсіздік және құпиялылық"</string>
+    <string name="safety_center_dashboard_page_title" msgid="7514620345152008005">"Қауіпсіздік және құпиялық"</string>
     <string name="safety_center_rescan_button" msgid="8047036829052958144">"Сканерлеу"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Жабу"</string>
     <string name="security_settings" msgid="3808106921175271317">"Қауіпсіздік параметрлері"</string>
     <string name="sensor_permissions_qs" msgid="4365989229426201877">"Датчик пайдалану рұқсаттары"</string>
-    <string name="privacy_controls_qs" msgid="471793881466080745">"Құпиялылық параметрлері"</string>
+    <string name="privacy_controls_qs" msgid="471793881466080745">"Құпиялық параметрлері"</string>
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Рұқсат өшірілді."</string>
     <string name="camera_usage_qs" msgid="7943349178368641820">"Камераны пайдаланатын басқа қолданбаларды көру"</string>
     <string name="microphone_usage_qs" msgid="2393193350541830472">"Микрофонды пайдаланатын басқа қолданбаларды көру"</string>
@@ -517,7 +517,7 @@
     <string name="recent_app_usage_1_qs" msgid="261450184773310741">"Соңғы рет <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g>) пайдаланды."</string>
     <string name="active_app_usage_2_qs" msgid="6107866785243565283">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) пайдалануда."</string>
     <string name="recent_app_usage_2_qs" msgid="3591205954235694403">"Соңғы рет <xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="ATTRIBUTION_LABEL">%2$s</xliff:g> • <xliff:g id="PROXY_LABEL">%3$s</xliff:g>) пайдаланды."</string>
-    <string name="safety_privacy_qs_tile_title" msgid="5431148204168066203">"Қауіпсіздік және құпиялылық"</string>
+    <string name="safety_privacy_qs_tile_title" msgid="5431148204168066203">"Қауіпсіздік және құпиялық"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Күйді тексеру"</string>
     <string name="media_confirm_dialog_positive_button" msgid="9020793594051526399">"Растау"</string>
     <string name="media_confirm_dialog_negative_button" msgid="226987376924861785">"Артқа"</string>
diff --git a/PermissionController/res/values-ko/strings.xml b/PermissionController/res/values-ko/strings.xml
index f940de6..5199d60 100644
--- a/PermissionController/res/values-ko/strings.xml
+++ b/PermissionController/res/values-ko/strings.xml
@@ -433,9 +433,9 @@
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6482937591816401619">"음성 어시스턴트 활성화를 위해 마이크가 사용되면 상태 표시줄에 아이콘 표시"</string>
     <string name="permgrouprequest_storage_isolated" msgid="4892154224026852295">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;에서 기기의 사진 및 미디어에 액세스하도록 허용하시겠습니까?"</string>
     <string name="permgrouprequest_contacts" msgid="8391550064551053695">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;에서 내 연락처에 액세스하도록 허용하시겠습니까?"</string>
-    <string name="permgrouprequest_location" msgid="6990232580121067883">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;에서 내 기기 위치에 액세스하도록 허용하시겠습니까?"</string>
+    <string name="permgrouprequest_location" msgid="6990232580121067883">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;에서 내 기기의 위치 정보에 액세스하도록 허용하시겠습니까?"</string>
     <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"앱을 사용할 때만 앱에서 위치에 액세스합니다."</string>
-    <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;에서 내 기기 위치에 액세스하도록 허용하시겠습니까?"</string>
+    <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;에서 내 기기의 위치 정보에 액세스하도록 허용하시겠습니까?"</string>
     <string name="permgroupbackgroundrequestdetail_location" msgid="8021219324989662957">"앱을 사용하고 있지 않을 때도 앱에서 내 위치에 항상 액세스하려고 할 수 있습니다. "<annotation id="link">"설정에서 액세스를 허용"</annotation>"하세요."</string>
     <string name="permgroupupgraderequest_location" msgid="8328408946822691636">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;의 위치 액세스 권한을 변경하시겠습니까?"</string>
     <string name="permgroupupgraderequestdetail_location" msgid="1550899076845189165">"앱을 사용하고 있지 않을 때도 앱에서 내 위치에 항상 액세스하려고 합니다. "<annotation id="link">"설정에서 액세스를 허용"</annotation>"하세요."</string>
diff --git a/PermissionController/res/values-ky/strings.xml b/PermissionController/res/values-ky/strings.xml
index 6782c7e..2399193 100644
--- a/PermissionController/res/values-ky/strings.xml
+++ b/PermissionController/res/values-ky/strings.xml
@@ -432,7 +432,7 @@
     <string name="assistant_record_audio_user_sensitive_title" msgid="5532123360322362378">"Үн жардамчысынын иштегенин чагылдырган сүрөтчөнү көрсөтүү"</string>
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6482937591816401619">"Үн жардамчысын иштетүү үчүн микрофон колдонулганда, абал тилкесинде сүрөтчө көрүнөт"</string>
     <string name="permgrouprequest_storage_isolated" msgid="4892154224026852295">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; колдонмосу үчүн түзмөгүңүздөгү сүрөттөр менен мультимедиа файлдарын иштетесизби?"</string>
-    <string name="permgrouprequest_contacts" msgid="8391550064551053695">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; колдонмосуна байланыштарыңызды пайдаланууга уруксат бересизби?"</string>
+    <string name="permgrouprequest_contacts" msgid="8391550064551053695">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; колдонмосуна байланыштарыңызды жеткиликтүү кыласызбы?"</string>
     <string name="permgrouprequest_location" msgid="6990232580121067883">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; колдонмосуна бул түзмөктүн жайгашкан жерин көрүүгө уруксат бересизби?"</string>
     <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"Колдонмону колдонуп жаткан маалда гана, ал сиздин кайда жүргөнүңүздү билип турат."</string>
     <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; колдонмосуна бул түзмөктүн жайгашкан жерин көрүүгө уруксат бересизби?"</string>
diff --git a/PermissionController/res/values-lv/strings.xml b/PermissionController/res/values-lv/strings.xml
index 0862ca6..333cf9c 100644
--- a/PermissionController/res/values-lv/strings.xml
+++ b/PermissionController/res/values-lv/strings.xml
@@ -409,7 +409,7 @@
     <string name="car_default_app_selected" msgid="5416420830430644174">"Atlasīta"</string>
     <string name="car_default_app_selected_with_info" msgid="1932204186080593500">"Atlasīta — <xliff:g id="ADDITIONAL_INFO">%1$s</xliff:g>"</string>
     <string name="special_app_access_search_keyword" msgid="8032347212290774210">"Īpaša lietotņu piekļuve"</string>
-    <string name="special_app_access" msgid="5019319067120213797">"Īpaša piekļuve lietotnēm"</string>
+    <string name="special_app_access" msgid="5019319067120213797">"Īpaša lietotņu piekļuve"</string>
     <string name="no_special_app_access" msgid="6950277571805106247">"Nav īpašas piekļuves lietotnēm"</string>
     <string name="special_app_access_no_apps" msgid="4102911722787886970">"Nav lietotņu"</string>
     <string name="home_missing_work_profile_support" msgid="1756855847669387977">"Darba profils netiek atbalstīts"</string>
diff --git a/PermissionController/res/values-nb/strings.xml b/PermissionController/res/values-nb/strings.xml
index 5c56917..56f29e1 100644
--- a/PermissionController/res/values-nb/strings.xml
+++ b/PermissionController/res/values-nb/strings.xml
@@ -170,8 +170,8 @@
     <string name="sort_spinner_most_permissions" msgid="1704349738096822836">"Flest tillatelser"</string>
     <string name="sort_spinner_most_accesses" msgid="5283913004357220161">"Mest brukt"</string>
     <string name="sort_spinner_recent" msgid="7513845273076525203">"Nylig"</string>
-    <string name="sort_by_app" msgid="4055799843051138087">"Sortér etter appbruk"</string>
-    <string name="sort_by_time" msgid="5435045320002150456">"Sortér etter tid"</string>
+    <string name="sort_by_app" msgid="4055799843051138087">"Sorter etter appbruk"</string>
+    <string name="sort_by_time" msgid="5435045320002150456">"Sorter etter tid"</string>
     <string name="item_separator" msgid="4030255389809224513">", "</string>
     <string name="permission_usage_refresh" msgid="2264056346561305420">"Last inn på nytt"</string>
     <string name="permission_history_title" msgid="8340081285133025225">"Tillatelseslogg"</string>
diff --git a/PermissionController/res/values-ne/strings.xml b/PermissionController/res/values-ne/strings.xml
index b01241a..fd88a97 100644
--- a/PermissionController/res/values-ne/strings.xml
+++ b/PermissionController/res/values-ne/strings.xml
@@ -432,7 +432,7 @@
     <string name="assistant_record_audio_user_sensitive_title" msgid="5532123360322362378">"सहायक ट्रिगर भएको पत्ता लागेमा देखाउनुहोस्"</string>
     <string name="assistant_record_audio_user_sensitive_summary" msgid="6482937591816401619">"आवाज सहायक सक्रिय गर्न माइक्रोफोनको प्रयोग गरिँदा स्टाटस बारमा आइकन देखाउनुहोस्"</string>
     <string name="permgrouprequest_storage_isolated" msgid="4892154224026852295">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; लाई आफ्नो डिभाइसका फोटो र मिडियामाथि पहुँच राख्न दिने हो?"</string>
-    <string name="permgrouprequest_contacts" msgid="8391550064551053695">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; लाई सम्पर्क ठेगानाको सूची प्रयोग गर्न दिने हो?"</string>
+    <string name="permgrouprequest_contacts" msgid="8391550064551053695">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; लाई कन्ट्याक्ट प्रयोग गर्न दिने हो?"</string>
     <string name="permgrouprequest_location" msgid="6990232580121067883">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;लाई यो डिभाइसको लोकेसन प्रयोग दिने हो?"</string>
     <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"तपाईंले एप प्रयोग गरिरहेका बेला मात्र उक्त एपले स्थानमाथि पहुँच राख्न सक्ने छ"</string>
     <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt;लाई यो डिभाइसको लोकेसन प्रयोग दिने हो?"</string>
diff --git a/PermissionController/res/values-pl/strings.xml b/PermissionController/res/values-pl/strings.xml
index a92379e..08d8e61 100644
--- a/PermissionController/res/values-pl/strings.xml
+++ b/PermissionController/res/values-pl/strings.xml
@@ -211,7 +211,7 @@
     <string name="auto_revocable_permissions_two" msgid="4874067408752041716">"Te uprawnienia zostaną usunięte: <xliff:g id="PERM_0">%1$s</xliff:g> i <xliff:g id="PERM_1">%2$s</xliff:g>."</string>
     <string name="auto_revocable_permissions_many" msgid="1521807896206032992">"Uprawnienia, które zostaną usunięte: <xliff:g id="PERMS">%1$s</xliff:g>."</string>
     <string name="auto_manage_title" msgid="7693181026874842935">"Automatyczne zarządzanie uprawnieniami"</string>
-    <string name="off" msgid="1438489226422866263">"Wyłącz"</string>
+    <string name="off" msgid="1438489226422866263">"Wyłączono"</string>
     <string name="auto_revoked_app_summary_one" msgid="7093213590301252970">"Usunięto uprawnienie <xliff:g id="PERMISSION_NAME">%s</xliff:g>"</string>
     <string name="auto_revoked_app_summary_two" msgid="1910545340763709389">"Usunięto uprawnienia: <xliff:g id="PERMISSION_NAME_0">%1$s</xliff:g> oraz <xliff:g id="PERMISSION_NAME_1">%2$s</xliff:g>"</string>
     <string name="auto_revoked_app_summary_many" msgid="5930976230827378798">"Usunięto uprawnienia: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> oraz kilka innych (<xliff:g id="NUMBER">%2$s</xliff:g>)"</string>
diff --git a/PermissionController/res/values-sr/strings.xml b/PermissionController/res/values-sr/strings.xml
index aed8e9c..d62adb4 100644
--- a/PermissionController/res/values-sr/strings.xml
+++ b/PermissionController/res/values-sr/strings.xml
@@ -332,7 +332,7 @@
     <string name="role_assistant_short_label" msgid="3369003713187703399">"Апликација дигиталног помоћника"</string>
     <string name="role_assistant_description" msgid="6622458130459922952">"Апликације за помоћ могу да вам помогну на основу информација са екрана који гледате. Неке апликације подржавају услуге покретача и гласовног уноса да би вам пружиле интегрисану помоћ."</string>
     <string name="role_browser_label" msgid="2877796144554070207">"Подразумевана апл. прегледача"</string>
-    <string name="role_browser_short_label" msgid="6745009127123292296">"Апликација за прегледач"</string>
+    <string name="role_browser_short_label" msgid="6745009127123292296">"Апликација прегледача"</string>
     <string name="role_browser_description" msgid="3465253637499842671">"Апликације које вам дају приступ интернету и приказују линкове које можете да додирнете"</string>
     <string name="role_browser_request_title" msgid="2895200507835937192">"Желите ли да подесите <xliff:g id="APP_NAME">%1$s</xliff:g> као подразумевану апликацију за прегледање?"</string>
     <string name="role_browser_request_description" msgid="5888803407905985941">"Није потребна ниједна дозвола"</string>
diff --git a/PermissionController/res/values-sv/strings.xml b/PermissionController/res/values-sv/strings.xml
index e505b75..769854c 100644
--- a/PermissionController/res/values-sv/strings.xml
+++ b/PermissionController/res/values-sv/strings.xml
@@ -330,7 +330,7 @@
     <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"De här apparna får visa din skärm, dina åtgärder och inmatningar, utföra åtgärder och styra skärmen."</string>
     <string name="role_assistant_label" msgid="4727586018198208128">"Digital assistentapp, standard"</string>
     <string name="role_assistant_short_label" msgid="3369003713187703399">"Digital assistentapp"</string>
-    <string name="role_assistant_description" msgid="6622458130459922952">"Med assistentappar kan du få hjälp av som baseras på den information som visas på den aktuella skärmen. Vissa appar har stöd för både översikts- och röstinmatningstjänster för att hjälpa dig."</string>
+    <string name="role_assistant_description" msgid="6622458130459922952">"Med assistentappar kan du få hjälp som baseras på den information som visas på den aktuella skärmen. Vissa appar har stöd för både översikts- och röstinmatningstjänster för att hjälpa dig."</string>
     <string name="role_browser_label" msgid="2877796144554070207">"Standard webbläsarapp"</string>
     <string name="role_browser_short_label" msgid="6745009127123292296">"Webbläsarapp"</string>
     <string name="role_browser_description" msgid="3465253637499842671">"Appar som visar länkar du trycker på och du använder för att ansluta till internet"</string>
diff --git a/PermissionController/res/values-te/strings.xml b/PermissionController/res/values-te/strings.xml
index 8131de8..4a794a4 100644
--- a/PermissionController/res/values-te/strings.xml
+++ b/PermissionController/res/values-te/strings.xml
@@ -173,7 +173,7 @@
     <string name="sort_by_app" msgid="4055799843051138087">"యాప్ వాడకం బట్టి వర్గీకరణ"</string>
     <string name="sort_by_time" msgid="5435045320002150456">"టైమ్‌ను బట్టి వర్గీకరణ"</string>
     <string name="item_separator" msgid="4030255389809224513">", "</string>
-    <string name="permission_usage_refresh" msgid="2264056346561305420">"రిఫ్రెష్ చేయి"</string>
+    <string name="permission_usage_refresh" msgid="2264056346561305420">"రిఫ్రెష్ చేయండి"</string>
     <string name="permission_history_title" msgid="8340081285133025225">"అనుమతి హిస్టరీ"</string>
     <string name="permission_history_category_today" msgid="7496389369158806620">"ఈరోజు"</string>
     <string name="permission_history_category_yesterday" msgid="7242517121222012521">"నిన్న"</string>
diff --git a/PermissionController/res/values-vi/strings.xml b/PermissionController/res/values-vi/strings.xml
index 5f9c332..12192dc 100644
--- a/PermissionController/res/values-vi/strings.xml
+++ b/PermissionController/res/values-vi/strings.xml
@@ -188,7 +188,7 @@
     <string name="app_permission_button_ask" msgid="3342950658789427">"Luôn hỏi"</string>
     <string name="app_permission_button_deny" msgid="6016454069832050300">"Không cho phép"</string>
     <string name="precise_image_description" msgid="6349638632303619872">"Vị trí chính xác"</string>
-    <string name="approximate_image_description" msgid="938803699637069884">"Vị trí gần đúng"</string>
+    <string name="approximate_image_description" msgid="938803699637069884">"Vị trí ước chừng"</string>
     <string name="app_permission_location_accuracy" msgid="7166912915040018669">"Sử dụng vị trí chính xác"</string>
     <string name="app_permission_location_accuracy_subtitle" msgid="2654077606404987210">"Khi chế độ vị trí chính xác đang tắt, các ứng dụng có thể truy cập vào thông tin vị trí gần đúng của bạn"</string>
     <string name="app_permission_title" msgid="2090897901051370711">"Quyền <xliff:g id="PERM">%1$s</xliff:g>"</string>
@@ -319,7 +319,7 @@
     <string name="no_permissions_allowed" msgid="6081976856354669209">"Chưa cấp quyền nào"</string>
     <string name="no_permissions_denied" msgid="8159923922804043282">"Chưa từ chối quyền nào"</string>
     <string name="no_apps_allowed" msgid="7718822655254468631">"Chưa cho phép ứng dụng nào"</string>
-    <string name="no_apps_allowed_full" msgid="8011716991498934104">"Không cho phép ứng dụng nào đối với tất cả các tệp"</string>
+    <string name="no_apps_allowed_full" msgid="8011716991498934104">"Không ứng dụng nào được phép truy cập tất cả các tệp"</string>
     <string name="no_apps_allowed_scoped" msgid="4908850477787659501">"Chỉ không cho phép ứng dụng nào đối với nội dung nghe nhìn"</string>
     <string name="no_apps_denied" msgid="7663435886986784743">"Chưa từ chối ứng dụng nào"</string>
     <string name="car_permission_selected" msgid="180837028920791596">"Đã chọn"</string>
diff --git a/PermissionController/res/values-zu/strings.xml b/PermissionController/res/values-zu/strings.xml
index 806c98d..dd8e365 100644
--- a/PermissionController/res/values-zu/strings.xml
+++ b/PermissionController/res/values-zu/strings.xml
@@ -397,7 +397,7 @@
     <string name="ongoing_usage_dialog_last_separator" msgid="4170995004748832163">" kanye "</string>
     <string name="default_app_search_keyword" msgid="8330125736889689743">"izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="permgroup_list_microphone_and_camera" msgid="962768198001487969">"Imakrofoni Nekhamera"</string>
-    <string name="settings_button" msgid="4414988414732479636">"Izilungiselelo"</string>
+    <string name="settings_button" msgid="4414988414732479636">"Amasethingi"</string>
     <string name="default_apps" msgid="5119201969348748639">"Izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="no_default_apps" msgid="2593466527182950231">"Azikho izinhlelo zokusebenza ezizenzakalelayo"</string>
     <string name="default_apps_more" msgid="4078194675848858093">"Okuzenzakalelayo okuningi"</string>
diff --git a/PermissionController/res/values/themes.xml b/PermissionController/res/values/themes.xml
index fe74cf3..5882c59 100644
--- a/PermissionController/res/values/themes.xml
+++ b/PermissionController/res/values/themes.xml
@@ -57,8 +57,12 @@
         <item name="android:windowIsTranslucent">true</item>
     </style>
 
-    <style name="GrantPermissions.Car">
-        <item name="carUiActivity">true</item>
+    <style name="GrantPermissions.Car" parent="Theme.CarUi.NoToolbar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!-- The following attributes change the behavior of the dialog, hence they should not be
+             themed -->
+        <item name="android:windowIsTranslucent">true</item>
     </style>
 
     <!-- Unused since R but exposed as overlayable. -->
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/BackupHelper.java b/PermissionController/src/com/android/permissioncontroller/permission/service/BackupHelper.java
index 0fc6448..9082b69 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/BackupHelper.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/BackupHelper.java
@@ -20,6 +20,7 @@
 import static android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED;
 import static android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED;
 import static android.content.pm.PackageManager.GET_PERMISSIONS;
+import static android.content.pm.PackageManager.GET_SIGNING_CERTIFICATES;
 import static android.util.Xml.newSerializer;
 
 import static com.android.permissioncontroller.Constants.DELAYED_RESTORE_PERMISSIONS_FILE;
@@ -31,13 +32,17 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.Signature;
+import android.content.pm.SigningInfo;
 import android.os.Build;
 import android.os.UserHandle;
 import android.permission.PermissionManager;
 import android.permission.PermissionManager.SplitPermissionInfo;
 import android.util.ArraySet;
+import android.util.Base64;
 import android.util.Log;
 import android.util.Xml;
 
@@ -49,6 +54,7 @@
 import com.android.permissioncontroller.permission.model.AppPermissionGroup;
 import com.android.permissioncontroller.permission.model.AppPermissions;
 import com.android.permissioncontroller.permission.model.Permission;
+import com.android.permissioncontroller.permission.utils.CollectionUtils;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -57,8 +63,13 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Helper for creating and restoring permission backups.
@@ -74,6 +85,11 @@
     private static final String TAG_GRANT = "grant";
     private static final String ATTR_PACKAGE_NAME = "pkg";
 
+    private static final String TAG_SIGNING_INFO = "sign";
+    private static final String TAG_CURRENT_CERTIFICATE = "curr-cert";
+    private static final String TAG_PAST_CERTIFICATE = "past-cert";
+    private static final String ATTR_CERTIFICATE_DIGEST = "digest";
+
     private static final String TAG_PERMISSION = "perm";
     private static final String ATTR_PERMISSION_NAME = "name";
     private static final String ATTR_IS_GRANTED = "g";
@@ -228,12 +244,16 @@
                 PackageInfo pkgInfo;
                 try {
                     pkgInfo = mContext.getPackageManager().getPackageInfo(pkgState.mPackageName,
-                            GET_PERMISSIONS);
+                            GET_PERMISSIONS | GET_SIGNING_CERTIFICATES);
                 } catch (PackageManager.NameNotFoundException ignored) {
                     packagesToRestoreLater.add(pkgState);
                     continue;
                 }
 
+                if (!checkCertificateDigestsMatch(pkgInfo, pkgState)) {
+                    continue;
+                }
+
                 pkgState.restore(mContext, pkgInfo);
             }
         }
@@ -244,6 +264,56 @@
     }
 
     /**
+     * Returns whether the backed up package and the package being restored have compatible signing
+     * certificate digests.
+     *
+     * <p> Permissions should only be restored if the backed up package has the same signing
+     * certificate(s) or an ancestor (in the case of certification rotation).
+     *
+     * <p>If no certificates are found stored for the backed up package, we return true anyway as
+     * certificate storage does not exist before {@link Build.VERSION_CODES.TIRAMISU}.
+     */
+    private boolean checkCertificateDigestsMatch(
+            @NonNull PackageInfo packageToRestoreInfo,
+            @NonNull BackupPackageState backupPackageState) {
+        // No signing information was stored for the backed up app.
+        if (backupPackageState.mBackupSigningInfoState == null) {
+            return true;
+        }
+
+        // The backed up app was unsigned.
+        if (backupPackageState.mBackupSigningInfoState.mCurrentCertDigests.isEmpty()) {
+            return false;
+        }
+
+        // We don't have signing information for the restored app, but the backed up app was signed.
+        if (packageToRestoreInfo.signingInfo == null) {
+            return false;
+        }
+
+        // The restored app is unsigned.
+        if (packageToRestoreInfo.signingInfo.getApkContentsSigners() == null
+                || packageToRestoreInfo.signingInfo.getApkContentsSigners().length == 0) {
+            return false;
+        }
+
+        // If the restored app is a system app, we allow permissions to be restored without any
+        // certificate checks.
+        // System apps are signed with the device's platform certificate, so on
+        // different phones the same system app can have different certificates.
+        // We perform this check to be consistent with the Backup and Restore feature logic in
+        // frameworks/base/services/core/java/com/android/server/backup/BackupUtils.java
+        if ((packageToRestoreInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+            return true;
+        }
+
+        // Both backed up app and restored app have signing information, so we check that these are
+        // compatible for the purpose of restoring permissions to the restored app.
+        return hasCompatibleSignaturesForRestore(packageToRestoreInfo.signingInfo,
+                backupPackageState.mBackupSigningInfoState);
+    }
+
+    /**
      * Write a xml file for the given packages.
      *
      * @param serializer The file to write to
@@ -308,7 +378,7 @@
      */
     void writeState(@NonNull XmlSerializer serializer) throws IOException {
         List<PackageInfo> pkgs = mContext.getPackageManager().getInstalledPackages(
-                GET_PERMISSIONS);
+                GET_PERMISSIONS | GET_SIGNING_CERTIFICATES);
         ArrayList<BackupPackageState> backupPkgs = new ArrayList<>();
 
         int numPkgs = pkgs.size();
@@ -348,7 +418,8 @@
 
             PackageInfo pkgInfo = null;
             try {
-                pkgInfo = mContext.getPackageManager().getPackageInfo(packageName, GET_PERMISSIONS);
+                pkgInfo = mContext.getPackageManager().getPackageInfo(
+                        packageName, GET_PERMISSIONS | GET_SIGNING_CERTIFICATES);
             } catch (PackageManager.NameNotFoundException e) {
                 Log.e(LOG_TAG, "Could not restore delayed permissions for " + packageName, e);
             }
@@ -358,7 +429,8 @@
                 for (int i = 0; i < numPkgs; i++) {
                     BackupPackageState pkgState = packagesToRestoreLater.get(i);
 
-                    if (pkgState.mPackageName.equals(packageName)) {
+                    if (pkgState.mPackageName.equals(packageName) && checkCertificateDigestsMatch(
+                            pkgInfo, pkgState)) {
                         pkgState.restore(mContext, pkgInfo);
                         packagesToRestoreLater.remove(i);
 
@@ -377,7 +449,8 @@
      * State that needs to be backed up for a permission.
      */
     private static class BackupPermissionState {
-        private final @NonNull String mPermissionName;
+        @NonNull
+        private final String mPermissionName;
         private final boolean mIsGranted;
         private final boolean mIsUserSet;
         private final boolean mIsUserFixed;
@@ -401,7 +474,8 @@
          *
          * @return The state
          */
-        static @NonNull List<BackupPermissionState> parseFromXml(@NonNull XmlPullParser parser,
+        @NonNull
+        static List<BackupPermissionState> parseFromXml(@NonNull XmlPullParser parser,
                 @NonNull Context context, int backupPlatformVersion)
                 throws XmlPullParserException {
             String permName = parser.getAttributeValue(null, ATTR_PERMISSION_NAME);
@@ -463,7 +537,8 @@
          * @return The state to back up or {@code null} if the permission does not need to be
          * backed up.
          */
-        private static @Nullable BackupPermissionState fromPermission(@NonNull Permission perm,
+        @Nullable
+        private static BackupPermissionState fromPermission(@NonNull Permission perm,
                 boolean appSupportsRuntimePermissions) {
             int grantFlags = perm.getFlags();
 
@@ -502,7 +577,8 @@
          * @return The state to back up. Empty list if no permissions in the group need to be backed
          * up
          */
-        static @NonNull ArrayList<BackupPermissionState> fromPermissionGroup(
+        @NonNull
+        static ArrayList<BackupPermissionState> fromPermissionGroup(
                 @NonNull AppPermissionGroup group) {
             ArrayList<BackupPermissionState> permissionsToRestore = new ArrayList<>();
             List<Permission> perms = group.getPermissions();
@@ -594,17 +670,153 @@
         }
     }
 
+    /** Signing certificate information for a backed up package. */
+    private static class BackupSigningInfoState {
+        @NonNull
+        private final Set<byte[]> mCurrentCertDigests;
+        @NonNull
+        private final Set<byte[]> mPastCertDigests;
+
+        private BackupSigningInfoState(@NonNull Set<byte[]> currentCertDigests,
+                @NonNull Set<byte[]> pastCertDigests) {
+            mCurrentCertDigests = currentCertDigests;
+            mPastCertDigests = pastCertDigests;
+        }
+
+        /**
+         * Write this state as XML.
+         *
+         * @param serializer the file to write to
+         */
+        void writeAsXml(@NonNull XmlSerializer serializer) throws IOException {
+            serializer.startTag(null, TAG_SIGNING_INFO);
+
+            for (byte[] digest : mCurrentCertDigests) {
+                serializer.startTag(null, TAG_CURRENT_CERTIFICATE);
+                serializer.attribute(
+                        null, ATTR_CERTIFICATE_DIGEST,
+                        Base64.encodeToString(digest, Base64.NO_WRAP));
+                serializer.endTag(null, TAG_CURRENT_CERTIFICATE);
+            }
+
+            for (byte[] digest : mPastCertDigests) {
+                serializer.startTag(null, TAG_PAST_CERTIFICATE);
+                serializer.attribute(
+                        null, ATTR_CERTIFICATE_DIGEST,
+                        Base64.encodeToString(digest, Base64.NO_WRAP));
+                serializer.endTag(null, TAG_PAST_CERTIFICATE);
+            }
+
+            serializer.endTag(null, TAG_SIGNING_INFO);
+        }
+
+        /**
+         * Parse the signing information state from XML.
+         *
+         * @param parser the data to read
+         *
+         * @return the signing information state
+         */
+        @NonNull
+        static BackupSigningInfoState parseFromXml(@NonNull XmlPullParser parser)
+                throws IOException, XmlPullParserException {
+            Set<byte[]> currentCertDigests = new HashSet<>();
+            Set<byte[]> pastCertDigests = new HashSet<>();
+
+            while (true) {
+                switch (parser.next()) {
+                    case START_TAG:
+                        switch (parser.getName()) {
+                            case TAG_CURRENT_CERTIFICATE:
+                                String currentCertDigest =
+                                        parser.getAttributeValue(
+                                                null, ATTR_CERTIFICATE_DIGEST);
+                                if (currentCertDigest == null) {
+                                    throw new XmlPullParserException(
+                                            "Found " + TAG_CURRENT_CERTIFICATE + " without "
+                                                    + ATTR_CERTIFICATE_DIGEST);
+                                }
+                                currentCertDigests.add(
+                                        Base64.decode(currentCertDigest, Base64.NO_WRAP));
+                                skipToEndOfTag(parser);
+                                break;
+                            case TAG_PAST_CERTIFICATE:
+                                String pastCertDigest =
+                                        parser.getAttributeValue(
+                                                null, ATTR_CERTIFICATE_DIGEST);
+                                if (pastCertDigest == null) {
+                                    throw new XmlPullParserException(
+                                            "Found " + TAG_PAST_CERTIFICATE + " without "
+                                                    + ATTR_CERTIFICATE_DIGEST);
+                                }
+                                pastCertDigests.add(
+                                        Base64.decode(pastCertDigest, Base64.NO_WRAP));
+                                skipToEndOfTag(parser);
+                                break;
+                            default:
+                                Log.w(LOG_TAG, "Found unexpected tag " + parser.getName());
+                                skipToEndOfTag(parser);
+                        }
+
+                        break;
+                    case END_TAG:
+                        return new BackupSigningInfoState(
+                                currentCertDigests,
+                                pastCertDigests);
+                    default:
+                        throw new XmlPullParserException("Could not parse signing info");
+                }
+            }
+        }
+
+        /**
+         * Construct the signing information state from a {@link SigningInfo} instance.
+         *
+         * @param signingInfo the {@link SigningInfo} instance
+         *
+         * @return the state
+         */
+        @NonNull
+        static BackupSigningInfoState fromSigningInfo(@NonNull SigningInfo signingInfo) {
+            Set<byte[]> currentCertDigests = new HashSet<>();
+            Set<byte[]> pastCertDigests = new HashSet<>();
+
+            Signature[] apkContentsSigners = signingInfo.getApkContentsSigners();
+            for (int i = 0; i < apkContentsSigners.length; i++) {
+                currentCertDigests.add(
+                        computeSha256DigestBytes(apkContentsSigners[i].toByteArray()));
+            }
+
+            if (signingInfo.hasPastSigningCertificates()) {
+                Signature[] signingCertificateHistory = signingInfo.getSigningCertificateHistory();
+                for (int i = 0; i < signingCertificateHistory.length; i++) {
+                    pastCertDigests.add(
+                            computeSha256DigestBytes(signingCertificateHistory[i].toByteArray()));
+                }
+            }
+
+            return new BackupSigningInfoState(currentCertDigests, pastCertDigests);
+        }
+    }
+
     /**
      * State that needs to be backed up for a package.
      */
     private static class BackupPackageState {
-        final @NonNull String mPackageName;
-        private final @NonNull ArrayList<BackupPermissionState> mPermissionsToRestore;
+        @NonNull
+        final String mPackageName;
+        @NonNull
+        private final ArrayList<BackupPermissionState> mPermissionsToRestore;
+        @Nullable
+        private final BackupSigningInfoState mBackupSigningInfoState;
 
-        private BackupPackageState(@NonNull String packageName,
-                @NonNull ArrayList<BackupPermissionState> permissionsToRestore) {
+        private BackupPackageState(
+                @NonNull String packageName,
+                @NonNull ArrayList<BackupPermissionState> permissionsToRestore,
+                @Nullable BackupSigningInfoState backupSigningInfoState) {
             mPackageName = packageName;
             mPermissionsToRestore = permissionsToRestore;
+            mBackupSigningInfoState = backupSigningInfoState;
         }
 
         /**
@@ -616,7 +828,8 @@
          *
          * @return The state
          */
-        static @NonNull BackupPackageState parseFromXml(@NonNull XmlPullParser parser,
+        @NonNull
+        static BackupPackageState parseFromXml(@NonNull XmlPullParser parser,
                 @NonNull Context context, int backupPlatformVersion)
                 throws IOException, XmlPullParserException {
             String packageName = parser.getAttributeValue(null, ATTR_PACKAGE_NAME);
@@ -626,6 +839,7 @@
             }
 
             ArrayList<BackupPermissionState> permissionsToRestore = new ArrayList<>();
+            BackupSigningInfoState signingInfo = null;
 
             while (true) {
                 switch (parser.next()) {
@@ -643,6 +857,16 @@
 
                                 skipToEndOfTag(parser);
                                 break;
+                            case TAG_SIGNING_INFO:
+                                try {
+                                    signingInfo = BackupSigningInfoState.parseFromXml(parser);
+                                } catch (XmlPullParserException e) {
+                                    Log.e(LOG_TAG, "Could not parse signing info for "
+                                            + packageName, e);
+                                    skipToEndOfTag(parser);
+                                }
+
+                                break;
                             default:
                                 // ignore tag
                                 Log.w(LOG_TAG, "Found unexpected tag " + parser.getName()
@@ -652,7 +876,10 @@
 
                         break;
                     case END_TAG:
-                        return new BackupPackageState(packageName, permissionsToRestore);
+                        return new BackupPackageState(
+                                packageName,
+                                permissionsToRestore,
+                                signingInfo);
                     case END_DOCUMENT:
                         throw new XmlPullParserException("Could not parse state for "
                                 + packageName);
@@ -669,7 +896,8 @@
          * @return The state to back up or {@code null} if no permission of the package need to be
          * backed up.
          */
-        static @Nullable BackupPackageState fromAppPermissions(@NonNull Context context,
+        @Nullable
+        static BackupPackageState fromAppPermissions(@NonNull Context context,
                 @NonNull PackageInfo pkgInfo) {
             AppPermissions appPerms = new AppPermissions(context, pkgInfo, false, null);
 
@@ -694,7 +922,14 @@
                 return null;
             }
 
-            return new BackupPackageState(pkgInfo.packageName, permissionsToRestore);
+            BackupSigningInfoState signingInfoState = null;
+
+            if (pkgInfo.signingInfo != null) {
+                signingInfoState = BackupSigningInfoState.fromSigningInfo(pkgInfo.signingInfo);
+            }
+
+            return new BackupPackageState(
+                    pkgInfo.packageName, permissionsToRestore, signingInfoState);
         }
 
         /**
@@ -715,6 +950,10 @@
                 mPermissionsToRestore.get(i).writeAsXml(serializer);
             }
 
+            if (mBackupSigningInfoState != null) {
+                mBackupSigningInfoState.writeAsXml(serializer);
+            }
+
             serializer.endTag(null, TAG_GRANT);
         }
 
@@ -760,4 +999,100 @@
             appPerms.persistChanges(true, affectedPermissions);
         }
     }
+
+    /**
+     * Returns whether the signing certificates of the restored app and backed up app are
+     * compatible for the restored app to be granted the backed up app's permissions.
+     *
+     * <p>This returns true when any one of the following is true:
+     *
+     * <ul>
+     *     <li> the backed up app has multiple signing certificates and the restored app
+     *     has identical multiple signing certificates
+     *     <li> the backed up app has a single signing certificate and it is the current
+     *     single signing certificate of the restored app
+     *     <li> the backed up app has a single signing certificate and it is present in the
+     *     signing certificate history of the restored app
+     *     <li> the backed up app has a single signing certificate and signing certificate
+     *     history, and the signing certificate of the restored app is present in that history
+     * </ul>*
+     */
+    private boolean hasCompatibleSignaturesForRestore(@NonNull SigningInfo restoredSigningInfo,
+            @NonNull BackupSigningInfoState backupSigningInfoState) {
+        Set<byte[]> backupCertDigests = backupSigningInfoState.mCurrentCertDigests;
+        Set<byte[]> backupPastCertDigests = backupSigningInfoState.mPastCertDigests;
+        Signature[] restoredSignatures = restoredSigningInfo.getApkContentsSigners();
+
+        // Check that both apps have the same number of signing certificates. This will be a
+        // required check for both the single and multiple certificate cases.
+        if (backupCertDigests.size() != restoredSignatures.length) {
+            return false;
+        }
+
+        Set<byte[]> restoredCertDigests = new HashSet<>();
+        for (Signature signature: restoredSignatures) {
+            restoredCertDigests.add(computeSha256DigestBytes(signature.toByteArray()));
+        }
+
+        // If the backed up app has multiple signing certificates, the restored app should be
+        // signed by that exact set of multiple signing certificates.
+        if (backupCertDigests.size() > 1) {
+            // Check that the restored certificates are a subset of the backed up certificates.
+            if (!CollectionUtils.containsSubset(backupCertDigests, restoredCertDigests)) {
+                return false;
+            }
+            // Check that the backed up certificates are a subset of the restored certificates.
+            if (!CollectionUtils.containsSubset(restoredCertDigests, backupCertDigests)) {
+                return false;
+            }
+            return true;
+        }
+
+        // If both apps have a single signing certificate, we check if they are equal or if one
+        // app's certificate is in the signing certificate history of the other.
+        byte[] backupCertDigest = backupCertDigests.iterator().next();
+        byte[] restoredPastCertDigest = restoredCertDigests.iterator().next();
+
+        // Check if the backed up app and restored app have the same signing certificate.
+        if (Arrays.equals(backupCertDigest, restoredPastCertDigest)) {
+            return true;
+        }
+
+        // Check if the restored app's certificate is in the backed up app's signing certificate
+        // history.
+        if (CollectionUtils.contains(backupPastCertDigests, restoredPastCertDigest)) {
+            return true;
+        }
+
+        // Check if the backed up app's certificate is in the restored app's signing certificate
+        // history.
+        if (restoredSigningInfo.hasPastSigningCertificates()) {
+            // The last element in the pastSigningCertificates array is the current signer;
+            // since that was verified above, just check all the signers in the lineage.
+            for (int i = 0; i < restoredSigningInfo.getSigningCertificateHistory().length - 1;
+                    i++) {
+                restoredPastCertDigest = computeSha256DigestBytes(
+                        restoredSigningInfo.getSigningCertificateHistory()[i].toByteArray());
+                if (Arrays.equals(backupCertDigest, restoredPastCertDigest)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /** Computes the SHA256 digest of the provided {@code byte} array. */
+    @Nullable
+    private static byte[] computeSha256DigestBytes(@NonNull byte[] data) {
+        MessageDigest messageDigest;
+        try {
+            messageDigest = MessageDigest.getInstance("SHA256");
+        } catch (NoSuchAlgorithmException e) {
+            return null;
+        }
+
+        messageDigest.update(data);
+
+        return messageDigest.digest();
+    }
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreference.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreference.java
index b69fb66..4006bcf 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreference.java
@@ -44,8 +44,12 @@
         setTitle(label);
         setIcon(tintedIcon);
         setIntent(managePgIntent);
-        updateSummary(permissionGroupInfo.getNonSystemGranted(),
-                permissionGroupInfo.getNonSystemUserSetOrPreGranted());
+        updateSummary(permissionGroupInfo);
+    }
+
+    void updateSummary(PermGroupPackagesUiInfo info) {
+        updateSummary(info.getNonSystemGranted(),
+                info.getNonSystemTotal());
     }
 
     void updateSummary(int granted, int used) {
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreferenceUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreferenceUtils.java
index 49a01ef..3541ede 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreferenceUtils.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionGroupPreferenceUtils.java
@@ -60,8 +60,7 @@
             if (preference == null) {
                 preference = new PermissionGroupPreference(context, info);
             } else {
-                preference.updateSummary(info.getNonSystemGranted(),
-                        info.getNonSystemUserSetOrPreGranted());
+                preference.updateSummary(info);
                 // Reset the ordering back to default, so that when we add it back it falls into the
                 // right place, and the preferences are ordered as we add them.
                 preference.setOrder(Preference.DEFAULT_ORDER);
@@ -99,8 +98,7 @@
             final PermissionGroupPreference preference =
                     (PermissionGroupPreference) preferenceGroup.getPreference(i);
             final PermGroupPackagesUiInfo info = permissionGroups.get(i);
-            preference.updateSummary(info.getNonSystemGranted(),
-                    info.getNonSystemUserSetOrPreGranted());
+            preference.updateSummary(info);
         }
     }
 
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/CollectionUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/CollectionUtils.java
index 4581f4e..6f2a307 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/CollectionUtils.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/CollectionUtils.java
@@ -21,9 +21,11 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Utility methods for dealing with {@link java.util.Collection}s.
@@ -93,4 +95,43 @@
     public static <T> List<T> singletonOrEmpty(@Nullable T element) {
         return element != null ? Collections.singletonList(element) : Collections.emptyList();
     }
+
+    /**
+     * Returns whether a byte array is contained within a {@link Set} of byte arrays. Equality is
+     * not compared by reference, but by comparing the elements contained in the arrays.
+     *
+     * @param byteArrays a {@link Set} of byte arrays that will be searched
+     * @param otherByteArray byte array to be searched
+     * @return {@code true} if {@code byteArrays} contains a byte array with identical elements as
+     *         {@code otherByteArray}.
+     */
+    public static boolean contains(@NonNull Set<byte[]> byteArrays,
+            @NonNull byte[] otherByteArray) {
+        for (byte[] byteArray : byteArrays) {
+            if (Arrays.equals(byteArray, otherByteArray)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns whether a {@link Set} of byte arrays is contained within a {@link Set} of byte arrays
+     * as a subset. Equality for arrays is not compared by reference, but by comparing the elements
+     * contained in the arrays.
+     *
+     * @param byteArrays a {@link Set} of byte arrays which will be checked as a superset
+     * @param otherByteArrays a {@link Set} of byte arrays which be checked as a subset
+     * @return {@code true} if {@code byteArrays} contains all the arrays in {@code
+     *     otherByteArrays}.
+     */
+    public static boolean containsSubset(
+            @NonNull Set<byte[]> byteArrays, @NonNull Set<byte[]> otherByteArrays) {
+        for (byte[] byteArray : otherByteArrays) {
+            if (!contains(byteArrays, byteArray)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/role/model/AssistantRoleBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/model/AssistantRoleBehavior.java
index 66dd8cc..c8286f9 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/model/AssistantRoleBehavior.java
+++ b/PermissionController/src/com/android/permissioncontroller/role/model/AssistantRoleBehavior.java
@@ -88,10 +88,8 @@
     @Override
     public Intent getManageIntentAsUser(@NonNull Role role, @NonNull UserHandle user,
             @NonNull Context context) {
-        boolean isAutomotive =
-                context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
 
-        if (isAutomotive) {
+        if (isAutomotive(context)){
             return null;
         }
 
@@ -102,6 +100,19 @@
     @Override
     public CharSequence getConfirmationMessage(@NonNull Role role, @NonNull String packageName,
             @NonNull Context context) {
+
+        // see (b/216746393) for details
+        if(isAutomotive(context)){
+            boolean contextEnabled = Settings.Secure.getInt(context.getContentResolver(),
+                "assist_structure_enabled", 1) != 0;
+            boolean screenshotEnabled = Settings.Secure.getInt(context.getContentResolver(),
+                "assist_screenshot_enabled", 1) != 0;
+
+            if(!contextEnabled && !screenshotEnabled){
+                return null;
+            }
+        }
+
         return context.getString(R.string.assistant_confirmation_message);
     }
 
@@ -186,6 +197,14 @@
     public void revoke(@NonNull Role role, @NonNull String packageName, @NonNull Context context) {
     }
 
+    /**
+     * Returns true if the device is an Automotive device
+     */
+    private boolean isAutomotive(@NonNull Context context) {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+    }
+
+
     private boolean isAssistantVoiceInteractionService(@NonNull PackageManager pm,
             @NonNull ServiceInfo si) {
         if (!android.Manifest.permission.BIND_VOICE_INTERACTION.equals(si.permission)) {
diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt
index ae25264..d8fa54b 100644
--- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt
+++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt
@@ -34,6 +34,7 @@
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.runBlockingTest
 import kotlinx.coroutines.test.setMain
@@ -188,4 +189,4 @@
         verifyZeroInteractions(mockPrivacySource)
         verifyZeroInteractions(mockPrivacySource2)
     }
-}
\ No newline at end of file
+}
diff --git a/SafetyCenter/Resources/res/values-en-rCA/strings.xml b/SafetyCenter/Resources/res/values-en-rCA/strings.xml
index 4c5a9c7..36754e5 100644
--- a/SafetyCenter/Resources/res/values-en-rCA/strings.xml
+++ b/SafetyCenter/Resources/res/values-en-rCA/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="safetyCenterResourcesAppLabel" msgid="4043334186295695930">"Safety Centre resources"</string>
+    <string name="safetyCenterResourcesAppLabel" msgid="4043334186295695930">"Safety Center Resources"</string>
     <string name="lock_screen_sources_title" msgid="3317906280484627707">"Device lock"</string>
     <string name="lock_screen_sources_summary" msgid="7220439741282516496"></string>
     <string name="lock_screen_title" msgid="4069104894527169877">"Screen lock"</string>
@@ -29,10 +29,10 @@
     <string name="permission_manager_title" msgid="5277347862821255015">"Permission manager"</string>
     <string name="permission_manager_summary" msgid="8099852107340970790">"Control app access to your data"</string>
     <string name="privacy_controls_title" msgid="5322875777945432395">"Privacy controls"</string>
-    <string name="privacy_controls_summary" msgid="2402066941190435424">"Control device access to microphone, camera and more"</string>
+    <string name="privacy_controls_summary" msgid="2402066941190435424">"Control device access to microphone, camera, and more"</string>
     <string name="advanced_title" msgid="8745436380690561172">"More settings"</string>
     <string name="advanced_security_title" msgid="1126833338772188155">"More security settings"</string>
-    <string name="advanced_security_summary" msgid="6172253327022425123">"Encryption, credentials and more"</string>
+    <string name="advanced_security_summary" msgid="6172253327022425123">"Encryption, credentials, and more"</string>
     <string name="advanced_privacy_title" msgid="1117725225706176643">"More privacy settings"</string>
-    <string name="advanced_privacy_summary" msgid="2281203390575069543">"Auto-fill, Activity controls and more"</string>
+    <string name="advanced_privacy_summary" msgid="2281203390575069543">"Autofill, activity controls, and more"</string>
 </resources>
diff --git a/SafetyCenter/Resources/res/values-fa/strings.xml b/SafetyCenter/Resources/res/values-fa/strings.xml
index 26406fe..5b87ebd 100644
--- a/SafetyCenter/Resources/res/values-fa/strings.xml
+++ b/SafetyCenter/Resources/res/values-fa/strings.xml
@@ -32,7 +32,7 @@
     <string name="privacy_controls_summary" msgid="2402066941190435424">"کنترل دسترسی دستگاه به میکروفون، دوربین، و غیره"</string>
     <string name="advanced_title" msgid="8745436380690561172">"تنظیمات بیشتر"</string>
     <string name="advanced_security_title" msgid="1126833338772188155">"تنظیمات امنیتی بیشتر"</string>
-    <string name="advanced_security_summary" msgid="6172253327022425123">"رمزگذاری، اطلاعات کاربری، و غیره"</string>
+    <string name="advanced_security_summary" msgid="6172253327022425123">"رمزگذاری، اطلاعات اعتباری، و غیره"</string>
     <string name="advanced_privacy_title" msgid="1117725225706176643">"تنظیمات حریم خصوصی بیشتر"</string>
     <string name="advanced_privacy_summary" msgid="2281203390575069543">"تکمیل خودکار، کنترل‌های فعالیت، و غیره"</string>
 </resources>
diff --git a/SafetyCenter/Resources/res/values-kk/strings.xml b/SafetyCenter/Resources/res/values-kk/strings.xml
index a494af7..914b834 100644
--- a/SafetyCenter/Resources/res/values-kk/strings.xml
+++ b/SafetyCenter/Resources/res/values-kk/strings.xml
@@ -22,17 +22,17 @@
     <string name="lock_screen_sources_summary" msgid="7220439741282516496"></string>
     <string name="lock_screen_title" msgid="4069104894527169877">"Экранды құлыптау"</string>
     <string name="lock_screen_summary_disabled" msgid="354071230916616692">"Әзірге мәлімет жоқ."</string>
-    <string name="privacy_sources_title" msgid="4061110826457365957">"Құпиялылық"</string>
+    <string name="privacy_sources_title" msgid="4061110826457365957">"Құпиялық"</string>
     <string name="privacy_sources_summary" msgid="4089719981155120864">"Басқару тақтасы, рұқсаттар, басқару элементтері"</string>
-    <string name="permission_usage_title" msgid="3633779688945350407">"Құпиялылық тақтасы"</string>
+    <string name="permission_usage_title" msgid="3633779688945350407">"Құпиялық тақтасы"</string>
     <string name="permission_usage_summary" msgid="5323079206029964468">"Жақында рұқсаттарды пайдаланған қолданбаларды көрсетеді."</string>
     <string name="permission_manager_title" msgid="5277347862821255015">"Рұқсат менеджері"</string>
     <string name="permission_manager_summary" msgid="8099852107340970790">"Қолданбалардың деректерді пайдалану рұқсатын басқару"</string>
-    <string name="privacy_controls_title" msgid="5322875777945432395">"Құпиялылық параметрлері"</string>
+    <string name="privacy_controls_title" msgid="5322875777945432395">"Құпиялық параметрлері"</string>
     <string name="privacy_controls_summary" msgid="2402066941190435424">"Құрылғының микрофонды, камераны және т. б. пайдалану рұқсатын басқару"</string>
     <string name="advanced_title" msgid="8745436380690561172">"Қосымша параметрлер"</string>
     <string name="advanced_security_title" msgid="1126833338772188155">"Қосымша қауіпсіздік параметрлері"</string>
     <string name="advanced_security_summary" msgid="6172253327022425123">"Шифрлау, тіркелу деректері және т. б."</string>
-    <string name="advanced_privacy_title" msgid="1117725225706176643">"Қосымша құпиялылық параметрлері"</string>
+    <string name="advanced_privacy_title" msgid="1117725225706176643">"Қосымша құпиялық параметрлері"</string>
     <string name="advanced_privacy_summary" msgid="2281203390575069543">"Автотолтыру, іс-әрекетті басқару элементтері және т. б."</string>
 </resources>
diff --git a/service/Android.bp b/service/Android.bp
index 73d240b..7ec4c42 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -86,6 +86,7 @@
     impl_library_visibility: [
         "//frameworks/base/apex/permission/tests",
         "//frameworks/base/services/tests/mockingservicestests",
+        "//frameworks/base/services/tests/PackageManagerServiceTests/server",
         "//frameworks/base/services/tests/servicestests",
         "//packages/modules/Permission/tests/apex",
     ],
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
index 0d166b1..1ae0e03 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
@@ -38,6 +38,7 @@
 import android.safetycenter.SafetySourceData.SEVERITY_LEVEL_UNSPECIFIED
 import android.safetycenter.SafetySourceErrorDetails
 import android.safetycenter.SafetySourceIssue
+import android.safetycenter.SafetySourceIssue.ISSUE_CATEGORY_DEVICE
 import android.safetycenter.SafetySourceStatus
 import android.safetycenter.config.SafetyCenterConfig
 import android.safetycenter.config.SafetySource
@@ -118,6 +119,7 @@
                         SafetySourceIssue.Action.Builder(
                                 "critical_action_id", "Solve issue", somePendingIntent)
                             .build())
+                    .setIssueCategory(ISSUE_CATEGORY_DEVICE)
                     .build())
             .build()
     private val listener =