Merge "fix: Include new WIDTH,HEIGHT,ORIENTATION in all." into tm-mainline-prod
diff --git a/apex/framework/java/android/provider/MediaStore.java b/apex/framework/java/android/provider/MediaStore.java
index 9f4e279..b86f5da 100644
--- a/apex/framework/java/android/provider/MediaStore.java
+++ b/apex/framework/java/android/provider/MediaStore.java
@@ -1198,7 +1198,7 @@
      * The displayed prompt will reflect all the media items you're requesting,
      * including those for which you already hold write access. If you want to
      * determine if you already hold write access before requesting access, use
-     * {@code ContentResolver#checkUriPermission(Uri, int, int)} with
+     * {@link Context#checkUriPermission(Uri, int, int, int)} with
      * {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}.
      * <p>
      * For security and performance reasons this method does not support
@@ -1239,7 +1239,7 @@
      * The displayed prompt will reflect all the media items you're requesting,
      * including those for which you already hold write access. If you want to
      * determine if you already hold write access before requesting access, use
-     * {@code ContentResolver#checkUriPermission(Uri, int, int)} with
+     * {@link Context#checkUriPermission(Uri, int, int, int)} with
      * {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}.
      *
      * @param resolver Used to connect with {@link MediaStore#AUTHORITY}.
@@ -1280,7 +1280,7 @@
      * The displayed prompt will reflect all the media items you're requesting,
      * including those for which you already hold write access. If you want to
      * determine if you already hold write access before requesting access, use
-     * {@code ContentResolver#checkUriPermission(Uri, int, int)} with
+     * {@link Context#checkUriPermission(Uri, int, int, int)} with
      * {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}.
      *
      * @param resolver Used to connect with {@link MediaStore#AUTHORITY}.
@@ -1321,7 +1321,7 @@
      * The displayed prompt will reflect all the media items you're requesting,
      * including those for which you already hold write access. If you want to
      * determine if you already hold write access before requesting access, use
-     * {@code ContentResolver#checkUriPermission(Uri, int, int)} with
+     * {@link Context#checkUriPermission(Uri, int, int, int)} with
      * {@link Intent#FLAG_GRANT_WRITE_URI_PERMISSION}.
      *
      * @param resolver Used to connect with {@link MediaStore#AUTHORITY}.
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9eef493..0c70e8e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Weier"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Blaai …"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Wolkmedia-app"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Wolkmedia-app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Deel foto\'s en video\'s wat jy van ander dienste af in die Android Fotokieser rugsteun"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Kry toegang tot wolkmedia vanaf"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Geen"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Voeg by"</string>
     <string name="deselect" msgid="4297825044827769490">"Ontkies"</string>
     <string name="deselected" msgid="8488133193326208475">"Ontkies"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6cc7cf5..dec4b9a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"ፍቀድ"</string>
     <string name="deny" msgid="6040983710442068936">"ከልክል"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ያስሱ…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"የደመና ሚዲያ መተግበሪያ"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"የደመና ሚዲያ መተግበሪያ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"በAndroid Photopicker ውስጥ እርስዎ ከሌሎች አገልግሎቶች ምትክ የሚያስቀምጡላቸውን ፎቶዎች እና ቪድዮዎች ያጋሩ"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"የደመና ሚዲያን ይድረሱ ከ"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ምንም"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"አክል"</string>
     <string name="deselect" msgid="4297825044827769490">"አትምረጥ"</string>
     <string name="deselected" msgid="8488133193326208475">"አልተመረጠም"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 402f4c6..f142774 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"رفض"</string>
     <string name="picker_browse" msgid="5554477454636075934">"جارٍ التصفّح..."</string>
     <string name="picker_settings" msgid="6443463167344790260">"تطبيق وسائط في السحابة الإلكترونية"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"تطبيق الوسائط في السحابة الإلكترونية"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"‏يمكنك استخدام Android Photopicker لمشاركة الصور والفيديوهات التي تحتفظ بنسخة احتياطية منها من الخدمات الأخرى."</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"الوصول إلى الوسائط في السحابة الإلكترونية من"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"بلا تطبيق"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"إضافة"</string>
     <string name="deselect" msgid="4297825044827769490">"إلغاء الاختيار"</string>
     <string name="deselected" msgid="8488133193326208475">"تم إلغاء الاختيار"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 56400a8..f7e5d10 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"অস্বীকাৰ কৰক"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ব্ৰাউজ কৰক…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ক্লাউড মিডিয়া এপ্"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ক্লাউড মিডিয়া এপ্"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"আপুনি অন্য সেৱাসমূহৰ পৰা বেক আপ লোৱা ফট’ আৰু ভিডিঅ’সমূহ Android Photopickerত শ্বেয়াৰ কৰক"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ইয়াৰ পৰা ক্লাউড মিডিয়া এক্সেছ কৰক"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"নাই"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"যোগ দিয়ক"</string>
     <string name="deselect" msgid="4297825044827769490">"বাছনিৰ পৰা আঁতৰাওক"</string>
     <string name="deselected" msgid="8488133193326208475">"বাছনিৰ পৰা আঁতৰোৱা হ’ল"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b29d842..7813b91 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Rədd edin"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Gözdən keçirin…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Bulud media tətbiqi"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Bulud media tətbiqi"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android Fotoseçicidə digər xidmətlərdən yedəklədiyiniz foto və videoları paylaşın"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Bulud mediasına buradan giriş edin:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Heç bir"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Əlavə edin"</string>
     <string name="deselect" msgid="4297825044827769490">"Seçimi ləğv edin"</string>
     <string name="deselected" msgid="8488133193326208475">"Seçimi ləğv edilib"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index e4526db..5e9398c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Odbij"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Pregledaj…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplikacija za medije u klaudu"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikacija za medije u klaudu"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Delite slike i video snimke za koje pravite rezervne kopije iz drugih usluga u Android biraču slika"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Pristupajte medijima u klaudu iz"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ništa"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Dodaj"</string>
     <string name="deselect" msgid="4297825044827769490">"Opozovi izbor"</string>
     <string name="deselected" msgid="8488133193326208475">"Opozvan je izbor"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d46d270..df0b149 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Адмовіць"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Прагляд…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Воблачнае мультымедыя"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Воблачная мультымедыйная праграма"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Дзякуючы інструменту выбару фота на Android вы можаце хутка абагуліць фота і відэа, рэзервовыя копіі якіх створаны ў іншых сэрвісах"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Доступ да воблачных мультымедыя з:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Няма"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Дадаць"</string>
     <string name="deselect" msgid="4297825044827769490">"Адмяніць выбар"</string>
     <string name="deselected" msgid="8488133193326208475">"Выбар скасаваны"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 50719d4..50f4ca3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Отказ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Преглед…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Медийно приложение в облака"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Приложение за мултимедия в облака"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Инструментът на Android за избор на снимки ви дава възможност да споделяте изображения и видеоклипове, на които създавате резервни копия от други услуги"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Достъп до мултимедия в облака от"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Няма"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Добавяне"</string>
     <string name="deselect" msgid="4297825044827769490">"Премахване на избора"</string>
     <string name="deselected" msgid="8488133193326208475">"Неизбрано"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3f6a025..d6dbb98 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"বাতিল করুন"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ব্রাউজ করুন…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ক্লাউড মিডিয়া অ্যাপ"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ক্লাউড মিডিয়া অ্যাপ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android ফটোপিকার টুলে অন্যান্য পরিষেবা থেকে ব্যাক-আপ নেওয়া ফটো ও ভিডিও শেয়ার করুন"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"এখান থেকে ক্লাউড মিডিয়া অ্যাক্সেস করুন"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"কোনওটিই নয়"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"যোগ করুন"</string>
     <string name="deselect" msgid="4297825044827769490">"টিক চিহ্নটি সরিয়ে দিন"</string>
     <string name="deselected" msgid="8488133193326208475">"টিকচিহ্ন সরিয়ে দিন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 444e4fc..569697e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Odbij"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Pregledajte…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Apl. za med. sadržaje u oblaku"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikacija za medijske sadržaje u oblaku"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Dijelite fotografije i videozapise čije sigurnosne kopije napravite s drugih usluga u Android Photopickeru"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Pristupite medijskom sadržaju u oblaku iz"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ništa"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Dodaj"</string>
     <string name="deselect" msgid="4297825044827769490">"Poništi odabir"</string>
     <string name="deselected" msgid="8488133193326208475">"Odabir poništen"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7feadbb..9343ff6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"Permet"</string>
     <string name="deny" msgid="6040983710442068936">"Denega"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Navega…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"Aplicació multimèdia al núvol"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplicació multimèdia al núvol"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Comparteix fotos i vídeos des d\'una còpia de seguretat d\'altres serveis d\'Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accedeix al contingut multimèdia al núvol des de"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Cap"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Afegeix"</string>
     <string name="deselect" msgid="4297825044827769490">"Desselecciona"</string>
     <string name="deselected" msgid="8488133193326208475">"Desseleccionat"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7c3f39b..f31a161 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Zakázat"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Procházet…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplikace pro cloudová média"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Aplikace pro cloudová média"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikace pro cloudová média"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Sdílet v nástroji Android Photopicker fotografie a videa zálohovaná z jiných služeb"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Přístup ke cloudovým médiím z"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Žádný"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Přidat"</string>
     <string name="deselect" msgid="4297825044827769490">"Zrušit výběr"</string>
     <string name="deselected" msgid="8488133193326208475">"Výběr zrušen"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6e0296f..dad5598 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Afvis"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Gennemse…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Skymedieapp"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Skymedieapp"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Del billeder og videoer, som du sikkerhedskopierer fra andre tjenester, i Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Få adgang til medier i skyen via"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ingen"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Tilføj"</string>
     <string name="deselect" msgid="4297825044827769490">"Fravælg"</string>
     <string name="deselected" msgid="8488133193326208475">"Fravalgt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 37b8e44..7e80223 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"Zulassen"</string>
     <string name="deny" msgid="6040983710442068936">"Ablehnen"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Stöbern…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"Cloud-Medien-App"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud-Medien-App"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Mit der Bildauswahl von Android kannst du Fotos und Videos teilen, die du über andere Dienste gesichert hast"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Zugriff auf Cloud-Medien aus"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Keine"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Hinzufügen"</string>
     <string name="deselect" msgid="4297825044827769490">"Auswahl aufheben"</string>
     <string name="deselected" msgid="8488133193326208475">"Auswahl aufgehoben"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c8ba9de..7c11faf 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Απόρριψη"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Περιήγηση…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Εφαρμογή μέσων στο cloud"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Εφαρμογή μέσων στο cloud"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Μοιραστείτε φωτογραφίες και βίντεο για τα οποία δημιουργείτε αντίγραφα ασφαλείας από άλλες υπηρεσίες στο Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Πρόσβαση σε μέσα στο cloud από"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Καμία"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Προσθήκη"</string>
     <string name="deselect" msgid="4297825044827769490">"Αποεπιλογή"</string>
     <string name="deselected" msgid="8488133193326208475">"Αποεπιλέχθηκε"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 1eadb9f..804b4e9 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -40,10 +40,12 @@
     <string name="deny" msgid="6040983710442068936">"Deny"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Browse…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloud media app"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Cloud media app"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud media app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Share photos and videos that you back up from other services in the Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Access cloud media from"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"None"</string>
+    <string name="picker_settings_toast_error" msgid="697274445512467469">"Could not change cloud media app at this time."</string>
     <string name="add" msgid="2894574044585549298">"Add"</string>
     <string name="deselect" msgid="4297825044827769490">"Deselect"</string>
     <string name="deselected" msgid="8488133193326208475">"Deselected"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6715c54..bcca0f9 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -40,10 +40,12 @@
     <string name="deny" msgid="6040983710442068936">"Deny"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Browse…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloud media app"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Cloud media app"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud media app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Share photos and videos you back up from other services in the Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Access cloud media from"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"None"</string>
+    <string name="picker_settings_toast_error" msgid="697274445512467469">"Could not change cloud media app at this time."</string>
     <string name="add" msgid="2894574044585549298">"Add"</string>
     <string name="deselect" msgid="4297825044827769490">"Deselect"</string>
     <string name="deselected" msgid="8488133193326208475">"Deselected"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 1eadb9f..804b4e9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -40,10 +40,12 @@
     <string name="deny" msgid="6040983710442068936">"Deny"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Browse…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloud media app"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Cloud media app"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud media app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Share photos and videos that you back up from other services in the Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Access cloud media from"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"None"</string>
+    <string name="picker_settings_toast_error" msgid="697274445512467469">"Could not change cloud media app at this time."</string>
     <string name="add" msgid="2894574044585549298">"Add"</string>
     <string name="deselect" msgid="4297825044827769490">"Deselect"</string>
     <string name="deselected" msgid="8488133193326208475">"Deselected"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 1eadb9f..804b4e9 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -40,10 +40,12 @@
     <string name="deny" msgid="6040983710442068936">"Deny"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Browse…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloud media app"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Cloud media app"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud media app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Share photos and videos that you back up from other services in the Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Access cloud media from"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"None"</string>
+    <string name="picker_settings_toast_error" msgid="697274445512467469">"Could not change cloud media app at this time."</string>
     <string name="add" msgid="2894574044585549298">"Add"</string>
     <string name="deselect" msgid="4297825044827769490">"Deselect"</string>
     <string name="deselected" msgid="8488133193326208475">"Deselected"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index c29fcce..f424e90 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -40,10 +40,12 @@
     <string name="deny" msgid="6040983710442068936">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎Deny‎‏‎‎‏‎"</string>
     <string name="picker_browse" msgid="5554477454636075934">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎Browse…‎‏‎‎‏‎"</string>
     <string name="picker_settings" msgid="6443463167344790260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎Cloud media app‎‏‎‎‏‎"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎Cloud media app‎‏‎‎‏‎"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎Cloud media app‎‏‎‎‏‎"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎Share photos and videos you back up from other services in the Android Photopicker‎‏‎‎‏‎"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎Access cloud media from‎‏‎‎‏‎"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="picker_settings_toast_error" msgid="697274445512467469">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎Could not change cloud media app at this time.‎‏‎‎‏‎"</string>
     <string name="add" msgid="2894574044585549298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎Add‎‏‎‎‏‎"</string>
     <string name="deselect" msgid="4297825044827769490">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎Deselect‎‏‎‎‏‎"</string>
     <string name="deselected" msgid="8488133193326208475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎Deselected‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b007759..634dcc9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Rechazar"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Explorar…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"App multimedia en la nube"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplicación multimedia en la nube"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Comparte las fotos y los vídeos de los que hayas creado una copia de seguridad desde otros servicios en el Photopicker de Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accede a los medios en la nube desde"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ninguna"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Agregar"</string>
     <string name="deselect" msgid="4297825044827769490">"Anular la selección"</string>
     <string name="deselected" msgid="8488133193326208475">"Sin seleccionar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2047635..a2e62b7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"Permitir"</string>
     <string name="deny" msgid="6040983710442068936">"Denegar"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Buscar…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"App multimedia en la nube"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplicación multimedia en la nube"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Comparte las fotos y los vídeos de los que hayas creado una copia de seguridad desde otros servicios en el selector de fotos de Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accede al contenido multimedia en la nube desde"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ninguna"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Añadir"</string>
     <string name="deselect" msgid="4297825044827769490">"Desmarcar"</string>
     <string name="deselected" msgid="8488133193326208475">"Desmarcado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index de08769..b888312 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Keela"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Sirvimine …"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Pilvemeediarakendus"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Pilvemeediarakendus"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Jagage Androidi fotovalijas fotosid ja videoid, mida varundate muudest teenustest"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Pilvemeediarakendus:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Pole"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Lisa"</string>
     <string name="deselect" msgid="4297825044827769490">"Tühista valik"</string>
     <string name="deselected" msgid="8488133193326208475">"Valik on tühistatud"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4ba3832..c34bb49 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Ukatu"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Arakatu…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Hodeiko multimedia-aplikazioa"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Hodeiko multimedia-aplikazioa"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Hodeiko multimedia-aplikazioa"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Partekatu beste zerbitzu batzuetako argazkien eta bideoen babeskopiak Android-en argazki-hautatzailean"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Atzitu honen bidez gordetako hodeiko multimedia-edukia:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Bat ere ez"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Gehitu"</string>
     <string name="deselect" msgid="4297825044827769490">"Desautatu"</string>
     <string name="deselected" msgid="8488133193326208475">"Desautatuta"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a15a318..58600e1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"مجاز نبودن"</string>
     <string name="picker_browse" msgid="5554477454636075934">"مرور کردن…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"برنامه رسانه ابری"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"برنامه رسانه ابری"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"‏عکس‌ها و ویدیوهایی که از سرویس‌های دیگر پشتیبان‌گیری می‌کنید در «انتخابگر عکس Android» هم‌رسانی می‌شود"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"دسترسی به رسانه ابری از"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"هیچ‌کدام"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"افزودن"</string>
     <string name="deselect" msgid="4297825044827769490">"لغو انتخاب"</string>
     <string name="deselected" msgid="8488133193326208475">"لغو انتخاب‌شده"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f36d1cb..71d153e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Estä"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Selaa…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Pilvimediasovellus"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Pilvimediasovellus"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Jaa muista palveluista varmuuskopioidut kuvat ja videot Androidin Kuvien valitsimessa"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Pääsy pilvimediaan:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"–"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Lisää"</string>
     <string name="deselect" msgid="4297825044827769490">"Poista valinta"</string>
     <string name="deselected" msgid="8488133193326208475">"Valinta poistettu"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1b56eb0..a6942e9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Refuser"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Parcourir…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Appli multimédia infonuagique"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Application multimédia infonuagique"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Partagez des photos et des vidéos que vous sauvegardez à partir d\'autres services dans Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accéder au contenu multimédia infonuagique à partir de"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Aucune"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Ajouter"</string>
     <string name="deselect" msgid="4297825044827769490">"Désélectionner"</string>
     <string name="deselected" msgid="8488133193326208475">"Désélectionné"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index abb51a8..08813f6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Refuser"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Parcourir…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Appli multimédia cloud"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Appli multimédia cloud"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Partagez des photos et vidéos sauvegardées à partir d\'autres services dans le sélecteur de photos Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accéder aux contenus multimédias cloud à partir de"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Aucune"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Ajouter"</string>
     <string name="deselect" msgid="4297825044827769490">"Désélectionner"</string>
     <string name="deselected" msgid="8488133193326208475">"Désélectionné"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7b036b7..590505a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Denegar"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Examinar…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplicación multimedia na nube"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplicación multimedia con servizo na nube"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Comparte as fotos e os vídeos dos que fixeses unha copia de seguranza desde outros servizos no selector de fotos de Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Acceder ao contido multimedia gardado na nube desde"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ningunha"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Engadir"</string>
     <string name="deselect" msgid="4297825044827769490">"Anular selección"</string>
     <string name="deselected" msgid="8488133193326208475">"Anulouse a selección"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8144a52..f2da415 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"નકારો"</string>
     <string name="picker_browse" msgid="5554477454636075934">"બ્રાઉઝ કરો…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ક્લાઉડ મીડિયા ઍપ"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"ક્લાઉડ મીડિયા ઍપ"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"ક્લાઉડ મીડિયા ઍપ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android Photopickerમાં તમે અન્ય સેવાઓથી બૅકઅપ લો છો તે ફોટા અને વીડિયોને શેર કરો"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"આમાંથી ક્લાઉડ મીડિયાને ઍક્સેસ કરો"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"એકપણ નહીં"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ઉમેરો"</string>
     <string name="deselect" msgid="4297825044827769490">"નાપસંદ કરો"</string>
     <string name="deselected" msgid="8488133193326208475">"નાપસંદ કર્યું"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 81f6848..ceefa35 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"अनुमति न दें"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ब्राउज़ करें…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"क्लाउड मीडिया ऐप्लिकेशन"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"क्लाउड मीडिया ऐप्लिकेशन"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android में फ़ोटो पिकर की मदद से, उन फ़ोटो और वीडियो को शेयर करें जिनका बैक अप आपने अन्य सेवाओं पर लिया है."</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"क्लाउड पर मौजूद मीडिया को यहां से ऐक्सेस करें:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"कोई नहीं"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"जोड़ें"</string>
     <string name="deselect" msgid="4297825044827769490">"चुना हुआ हटाएं"</string>
     <string name="deselected" msgid="8488133193326208475">"चुना हुआ हटाया गया"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 84c83f7..ac0db6a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Odbij"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Pregled…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplikacija za medije u oblaku"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikacija za medijske sadržaje u oblaku"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Podijelite fotografije i videozapise koje sigurnosno kopirate s drugih usluga u Androidovom alatu za odabir fotografija"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Pristupi medijima u oblaku putem"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ništa"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Dodaj"</string>
     <string name="deselect" msgid="4297825044827769490">"Poništi odabir"</string>
     <string name="deselected" msgid="8488133193326208475">"Odabir poništen"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f9df691..bdf2913 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Tiltás"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Böngészés…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Felhőbeli médiaalkalmazás"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Felhőbeli médiaalkalmazás"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Az Android Photopicker szolgáltatásban megoszthat olyan fotókat és videókat, amelyekről más alkalmazásokból készít biztonsági másolatot"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Hozzáférés a következő szolgáltatásban tárolt felhőbeli médiatartalmakhoz:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nincs"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Hozzáadás"</string>
     <string name="deselect" msgid="4297825044827769490">"Jelölés törlése"</string>
     <string name="deselected" msgid="8488133193326208475">"Kijelölés megszüntetve"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 93086fd..6252011 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Մերժել"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Դիտել…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Ամպային մուլտիմեդիա հավելված"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Ամպային մուլտիմեդիա հավելված"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android-ի լուսանկարների ընտրիչի միջոցով կիսվեք լուսանկարներով և տեսանյութերով, որոնք պահուստավորում եք այլ ծառայություններում"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Օգտվեք ամպային մեդիա բովանդակությունից հետևյալ մատակարարից՝"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Չկա"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Ավելացնել"</string>
     <string name="deselect" msgid="4297825044827769490">"Ապընտրել"</string>
     <string name="deselected" msgid="8488133193326208475">"Ապընտրված"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5f25979..e01024a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Tolak"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Cari …"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplikasi media cloud"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikasi media cloud"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Bagikan foto dan video yang Anda cadangkan dari layanan lainnya di Pemilih foto Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Akses media cloud dari"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Tidak ada"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Tambahkan"</string>
     <string name="deselect" msgid="4297825044827769490">"Batalkan pilihan"</string>
     <string name="deselected" msgid="8488133193326208475">"Batal dipilih"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 3a8ed29..3cd0c9f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Hafna"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Skoða…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Efnisforrit í skýi"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Efnisforrit í skýi"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Deildu myndum og myndskeiðum sem þú tekur afrit af í öðrum þjónustum í Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Opna skýjaefni frá"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ekkert"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Bæta við"</string>
     <string name="deselect" msgid="4297825044827769490">"Afvelja"</string>
     <string name="deselected" msgid="8488133193326208475">"Afvalið"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index bdeea79..6fa4e29 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Rifiuta"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Sfoglia…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"App multimediale cloud"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"App multimediale cloud"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"App multimediale con funzionalità cloud"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Condividi foto e video di cui esegui il backup da altri servizi nel selettore di foto Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accedi ai contenuti multimediali sul cloud da"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nessuna"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Aggiungi"</string>
     <string name="deselect" msgid="4297825044827769490">"Deseleziona"</string>
     <string name="deselected" msgid="8488133193326208475">"Deselezionato"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 10cbb78..55f5967 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"דחייה"</string>
     <string name="picker_browse" msgid="5554477454636075934">"עיון…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"אפליקציית מדיה בענן"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"אפליקציית מדיה בענן"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"אפליקציית מדיה בענן"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"‏אפשר לשתף תמונות וסרטונים שגיבית משירותים אחרים בכלי לבחירת תמונות ב-Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"גישה למדיה בענן מתוך"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ללא"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"הוספה"</string>
     <string name="deselect" msgid="4297825044827769490">"ביטול הבחירה"</string>
     <string name="deselected" msgid="8488133193326208475">"הבחירה בוטלה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e169a42..2993f5e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"許可しない"</string>
     <string name="picker_browse" msgid="5554477454636075934">"参照…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"クラウド メディアアプリ"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"クラウド メディアアプリ"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"クラウド メディア アプリ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"他のサービスからバックアップした写真と動画を Android の写真選択ツールで共有できます"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"クラウド メディアへのアクセス元"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"なし"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"追加"</string>
     <string name="deselect" msgid="4297825044827769490">"選択を解除"</string>
     <string name="deselected" msgid="8488133193326208475">"選択解除済み"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index f33ec25..c62afb9 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"უარყოფა"</string>
     <string name="picker_browse" msgid="5554477454636075934">"დათვალიერება…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ღრუბლოვანი მედია აპი"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ღრუბლოვანი მედია აპი"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"გააზიარეთ ფოტოები და ვიდეოები, რომელთა სარეზერვო ასლები შექმნილი გაქვთ Android Photopicker-ის სხვა სერვისებიდან"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ღრუბლოვან მედიაზე წვდომა აქედან:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"არცერთი"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"დამატება"</string>
     <string name="deselect" msgid="4297825044827769490">"არჩევის გაუქმება"</string>
     <string name="deselected" msgid="8488133193326208475">"არჩევა გაუქმებულია"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index dd036c2..7c1bc2f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"Рұқсат ету"</string>
     <string name="deny" msgid="6040983710442068936">"Тыйым салу"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Шолу…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"Бұлттық мультимедиа қолданбасы"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Бұлттық мультимедиа қолданбасы"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Басқа қызметтерде сақтық көшірмесін жасаған суреттер мен бейнелерді Android сурет таңдағыш құралында бөлісіңіз."</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Бұлттық мультимедиа қолданбасына келесі жерден кіріңіз:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Жоқ"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Қосу"</string>
     <string name="deselect" msgid="4297825044827769490">"Таңдамау"</string>
     <string name="deselected" msgid="8488133193326208475">"Таңдау алынған"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 3f95f87..f4f929a 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"បដិសេធ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"រុករក…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"កម្មវិធី​មេឌៀលើពពក"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"កម្មវិធី​មេឌៀលើពពក"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"ចែករំលែករូបថត និងវីដេអូដែលអ្នកបម្រុងទុកពីសេវាកម្មផ្សេងទៀតនៅក្នុងផ្ទាំងជ្រើសរើសរូបថតរបស់ Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ចូលប្រើប្រាស់មេឌៀលើពពកពី"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"គ្មាន"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"បញ្ចូល"</string>
     <string name="deselect" msgid="4297825044827769490">"ដក​ការជ្រើសរើស"</string>
     <string name="deselected" msgid="8488133193326208475">"បានដក​ការជ្រើសរើស"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 81319ec..7be6f83 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"ನಿರಾಕರಿಸಿ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ಬ್ರೌಸ್ ಮಾಡಿ…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ಕ್ಲೌಡ್ ಮಾಧ್ಯಮ ಆ್ಯಪ್‌"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"ಕ್ಲೌಡ್ ಮಾಧ್ಯಮ ಆ್ಯಪ್‌"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"ಕ್ಲೌಡ್ ಮಾಧ್ಯಮ ಆ್ಯಪ್‌"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android ಫೋಟೋ ಪಿಕರ್‌ನಲ್ಲಿ ಇತರ ಸೇವೆಗಳಿಂದ ನೀವು ಬ್ಯಾಕಪ್ ಮಾಡುವ ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ಇದರಿಂದ ಕ್ಲೌಡ್ ಮಾಧ್ಯಮವನ್ನು ಪ್ರವೇಶಿಸಿ"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ಸೇರಿಸಿ"</string>
     <string name="deselect" msgid="4297825044827769490">"ಆಯ್ಕೆ ರದ್ದುಮಾಡಿ"</string>
     <string name="deselected" msgid="8488133193326208475">"ಆಯ್ಕೆ ರದ್ದುಮಾಡಲಾಗಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6502c8e..2d1a534 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"거부"</string>
     <string name="picker_browse" msgid="5554477454636075934">"찾아보기…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"클라우드 미디어 앱"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"클라우드 미디어 앱"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"다른 서비스에서 백업한 사진과 동영상을 Android 사진 선택 도구에서 공유합니다."</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"클라우드 미디어 액세스 위치"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"없음"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"추가"</string>
     <string name="deselect" msgid="4297825044827769490">"선택 해제"</string>
     <string name="deselected" msgid="8488133193326208475">"선택 해제됨"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 3b24c6e..f640e42 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Жок"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Карап чыгуу…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Булуттагы мультимедиа колдонмосу"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Булуттагы мультимедиа колдонмосу"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Камдык көчүрмөсү башка кызматтарда сакталган сүрөттөр менен видеолорду Android Photopicker аркылуу бөлүшүү"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Төмөнкүдөн алынган булуттагы мультимедианы колдонуу:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Жок"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Кошуу"</string>
     <string name="deselect" msgid="4297825044827769490">"Тандоодон чыгаруу"</string>
     <string name="deselected" msgid="8488133193326208475">"Тандоодон чыгарылды"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 84fe448..c9ee449 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"ປະຕິເສດ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ເລືອກເບິ່ງ…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ແອັບມີເດຍໃນລະບົບຄລາວ"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ແອັບມີເດຍໃນລະບົບຄລາວ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"ແບ່ງປັນຮູບພາບ ແລະ ວິດີໂອທີ່ທ່ານສຳຮອງຂໍ້ມູນຈາກບໍລິການອື່ນໆໃນ Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ເຂົ້າເຖິງມີເດຍໃນລະບົບຄລາວຈາກ"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ບໍ່ມີ"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ເພີ່ມ"</string>
     <string name="deselect" msgid="4297825044827769490">"ເຊົາເລືອກ"</string>
     <string name="deselected" msgid="8488133193326208475">"ເຊົາເລືອກແລ້ວ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 5685e9e..aa97de8 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Atmesti"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Naršyti…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Medijos debesyje programa"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Medijos debesyje programa"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Medijos debesyje programa"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Naudodami „Android Photopicker“ bendrinkite nuotraukas ir vaizdo įrašus, kurių atsargines kopijas kuriate kitose paslaugose"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Pasiekti mediją debesyje iš"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nėra"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Pridėti"</string>
     <string name="deselect" msgid="4297825044827769490">"Panaikinti pasirinkimą"</string>
     <string name="deselected" msgid="8488133193326208475">"Pasirinkimas panaikintas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7f5cc5c..98b122f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Neatļaut"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Pārlūkot…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Mākoņa multivides lietotne"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Mākoņa multivides lietotne"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Kopīgojiet no citiem pakalpojumiem dublētos fotoattēlus un videoklipus Android fotoattēlu atlasītājā."</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Piekļūstiet mākoņa multivides saturam no"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nav"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Pievienot"</string>
     <string name="deselect" msgid="4297825044827769490">"Noņemt atlasi"</string>
     <string name="deselected" msgid="8488133193326208475">"Atlase noņemta"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 62cbc11..092faaf 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Одбиј"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Прелистувајте…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Апликација за содржини во облак"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"Апликација за содржини во облак"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"Апликација за аудиовизуелни содржини во облак"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Споделувајте фотографии и видеа од кои сте направиле бекап од други услуги во „Избирачот на фотографии на Android“"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Пристапете до аудиовизуелните содржини во облак од"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Нема"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Додај"</string>
     <string name="deselect" msgid="4297825044827769490">"Поништи го изборот"</string>
     <string name="deselected" msgid="8488133193326208475">"Изборот е поништен"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3f759fa..e0f797e 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"നിരസിക്കുക"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ബ്രൗസ് ചെയ്യുക…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ക്ലൗഡ് മീഡിയ ആപ്പ്"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ക്ലൗഡ് മീഡിയ ആക്‌സസ് ചെയ്യുക"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"മറ്റ് സേവനങ്ങളിൽ നിന്ന് നിങ്ങൾ ബാക്കപ്പ് ചെയ്യുന്ന ഫോട്ടോകളും വീഡിയോകളും Android Photopicker-ൽ പങ്കിടുക"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ക്ലൗഡ് മീഡിയ ആപ്പിൽ നിന്ന്"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ഒന്നുമില്ല"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ചേർക്കുക"</string>
     <string name="deselect" msgid="4297825044827769490">"തിരഞ്ഞെടുത്തത് മാറ്റുക"</string>
     <string name="deselected" msgid="8488133193326208475">"തിരഞ്ഞെടുത്തത് മാറ്റി"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index cc774b6..89d6360 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Татгалзах"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Үзэх…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Үүлэн медиа апп"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Үүлэн медиа апп"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android Photopicker-д өөр үйлчилгээнээс хуулбарласан зураг болон видеог хуваалцаарай"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Дараахаас үүлэн медиад хандах"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Байхгүй"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Нэмэх"</string>
     <string name="deselect" msgid="4297825044827769490">"Сонголтыг цуцлах"</string>
     <string name="deselected" msgid="8488133193326208475">"Сонголтыг цуцалсан"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 17c7549..d3d8211 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"नकार द्या"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ब्राउझ करा…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"क्लाउड मीडिया अ‍ॅप"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"क्लाउड मीडिया अ‍ॅप"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"तुम्ही इतर सेवांवरून Android फोटोपिकरवर बॅक अप घेतलेले फोटो आणि व्हिडिओ शेअर करा"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"येथून क्लाउड मीडिया अ‍ॅक्सेस करा"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"काहीही नाही"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"जोडा"</string>
     <string name="deselect" msgid="4297825044827769490">"निवड रद्द करा"</string>
     <string name="deselected" msgid="8488133193326208475">"निवड रद्द केली आहे"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 21b8ffa..64df5f8 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Tolak"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Semak imbas…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Apl media awan"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Apl media awan"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Kongsi foto dan video yang anda sandarkan daripada perkhidmatan lain dalam Pemilih Foto Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Akses media awan daripada"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Tiada"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Tambah"</string>
     <string name="deselect" msgid="4297825044827769490">"Nyahpilih"</string>
     <string name="deselected" msgid="8488133193326208475">"Dinyahpilih"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index d4c7eb6..0d315e9 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"ပယ်ရန်"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ဖွင့်ကြည့်ရန်…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloud မီဒီယာအက်ပ်"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud မီဒီယာအက်ပ်"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android Photopicker အတွင်း အခြားဝန်ဆောင်မှုများမှ အရန်သိမ်းသော ဓာတ်ပုံနှင့် ဗီဒီယိုများ မျှဝေနိုင်သည်"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Cloud မီဒီယာကို ဤနေရာမှ ဝင်သုံးရန်"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"မရှိ"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ထည့်ရန်"</string>
     <string name="deselect" msgid="4297825044827769490">"မရွေးပါနှင့်"</string>
     <string name="deselected" msgid="8488133193326208475">"ရွေးချယ်မထားပါ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 059b9e7..b018aa8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Avvis"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Bla gjennom…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Skymedieapp"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Skymedieapp"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Del bilder og videoer du sikkerhetskopierer fra andre tjenester, i Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Åpne skymedier fra"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ingen"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Legg til"</string>
     <string name="deselect" msgid="4297825044827769490">"Fjern merking"</string>
     <string name="deselected" msgid="8488133193326208475">"Ikke valgt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 5e5495c..86a6638 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"अस्वीकार गर्नुहोस्"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ब्राउज गर्नुहोस्…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"क्लाउड मिडिया एप"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"क्लाउड मिडिया एप"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"आफूले Android Photopicker मा विभिन्न सेवाहरूबाट ब्याकअप गर्ने फोटो तथा भिडियोहरू सेयर गर्नुहोस्"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"यसबाट क्लाउड मिडिया प्रयोग गर्नुहोस्"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"कुनै पनि होइन"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"हाल्नुहोस्"</string>
     <string name="deselect" msgid="4297825044827769490">"चयन रद्द गर्नुहोस्"</string>
     <string name="deselected" msgid="8488133193326208475">"चयन रद्द गरियो"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 23c1309..5f8b71b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Weigeren"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Browsen…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloudmedia-app"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloudmedia-app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Deel foto\'s en video\'s waarvan je een back-up hebt gemaakt uit andere services in de fotokiezer van Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Cloudmedia openen vanuit"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Geen"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Toevoegen"</string>
     <string name="deselect" msgid="4297825044827769490">"Deselecteren"</string>
     <string name="deselected" msgid="8488133193326208475">"Gedeselecteerd"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 8838b16..557cac1 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ବ୍ରାଉଜ କରନ୍ତୁ…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"କ୍ଲାଉଡ ମିଡିଆ ଆପ"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"କ୍ଲାଉଡ ମିଡିଆ ଆପ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android Photopickerରେ ଅନ୍ୟ ସେବାଗୁଡ଼ିକରୁ ଆପଣ ବେକଅପ ନେଇଥିବା ଫଟୋ ଓ ଭିଡିଓଗୁଡ଼ିକୁ ସେୟାର କରନ୍ତୁ"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ଏଠାରୁ କ୍ଲାଉଡ ମିଡିଆକୁ ଆକ୍ସେସ କରନ୍ତୁ"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"କିଛି ନାହିଁ"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ଯୋଗ କରନ୍ତୁ"</string>
     <string name="deselect" msgid="4297825044827769490">"ଅଚୟନ କରନ୍ତୁ"</string>
     <string name="deselected" msgid="8488133193326208475">"ଅଚୟନ କରାଯାଇଛି"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 96ca869..cc904a4 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"ਨਾ ਕਰਨ ਦਿਓ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"ਬ੍ਰਾਊਜ਼ ਕਰੋ…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ਕਲਾਊਡ ਮੀਡੀਆ ਐਪ"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ਕਲਾਊਡ ਮੀਡੀਆ ਐਪ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android ਦੇ ਫ਼ੋਟੋ ਚੋਣਕਾਰ ਦੀ ਮਦਦ ਨਾਲ ਉਨ੍ਹਾਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਨੂੰ ਸਾਂਝਾ ਕਰੋ ਜਿਨ੍ਹਾਂ ਦਾ ਬੈਕਅੱਪ ਤੁਸੀਂ ਹੋਰ ਸੇਵਾਵਾਂ ਤੋਂ ਲਿਆ ਹੈ"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"ਇੱਥੋਂ ਕਲਾਊਡ ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਕਰੋ"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ਕੋਈ ਨਹੀਂ"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="deselect" msgid="4297825044827769490">"ਅਣ-ਚੁਣਿਆ ਕਰੋ"</string>
     <string name="deselected" msgid="8488133193326208475">"ਅਣ-ਚੁਣਿਆ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f11140a..0948eb8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"Zezwól"</string>
     <string name="deny" msgid="6040983710442068936">"Odmów"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Przeglądaj…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"Aplikacja do multimediów w chmurze"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikacja do multimediów w chmurze"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Udostępniaj zdjęcia i filmy, których kopie zapasowe tworzysz w innych usługach, w Selektorze zdjęć na Androidzie"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Otwieraj multimedia w chmurze za pomocą:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Brak"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Dodaj"</string>
     <string name="deselect" msgid="4297825044827769490">"Odznacz"</string>
     <string name="deselected" msgid="8488133193326208475">"Usunięto wybór"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index aba4aff..4e43b39 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Negar"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Procurar…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"App de mídia em nuvem"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"App de mídia em nuvem"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"App de mídia em nuvem"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Compartilhar fotos e vídeos que você armazena em backup de outros serviços no Seletor de fotos do Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Acessar a mídia em nuvem de"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nenhum"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Adicionar"</string>
     <string name="deselect" msgid="4297825044827769490">"Desmarcar"</string>
     <string name="deselected" msgid="8488133193326208475">"Desmarcada"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0bfeb50..0999486 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -40,10 +40,12 @@
     <string name="deny" msgid="6040983710442068936">"Recusar"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Procurar…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"App de multimédia na nuvem"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"App de multimédia na nuvem"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"App de multimédia na nuvem"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Partilhe fotos e vídeos dos quais fez uma cópia de segurança a partir de outros serviços no Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Aceda a multimédia na nuvem a partir de"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nenhuma"</string>
+    <string name="picker_settings_toast_error" msgid="697274445512467469">"Impossível alterar a app de multimédia na nuvem."</string>
     <string name="add" msgid="2894574044585549298">"Adicionar"</string>
     <string name="deselect" msgid="4297825044827769490">"Desselecionar"</string>
     <string name="deselected" msgid="8488133193326208475">"Desmarcado"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index aba4aff..4e43b39 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"Negar"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Procurar…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"App de mídia em nuvem"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"App de mídia em nuvem"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"App de mídia em nuvem"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Compartilhar fotos e vídeos que você armazena em backup de outros serviços no Seletor de fotos do Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Acessar a mídia em nuvem de"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Nenhum"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Adicionar"</string>
     <string name="deselect" msgid="4297825044827769490">"Desmarcar"</string>
     <string name="deselected" msgid="8488133193326208475">"Desmarcada"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 82955de..ca61eb5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Refuz"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Răsfoiește…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplicația media în cloud"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplicația media în cloud"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Distribuie fotografiile și videoclipurile cărora le faci backup din alte servicii în Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Accesează conținutul media în cloud din"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Niciuna"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Adaugă"</string>
     <string name="deselect" msgid="4297825044827769490">"Debifează"</string>
     <string name="deselected" msgid="8488133193326208475">"Deselectat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6135877..a22176e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Запретить"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Посмотреть"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Прил. для облачн. мультимедиа"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Приложение для мультимедиа в облаке"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Делитесь фотографиями и видео из других сервисов, для которых вы сохранили резервные копии, в окне выбора фотографий Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Получите доступ к мультимедиа в облаке"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Нет"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Добавить"</string>
     <string name="deselect" msgid="4297825044827769490">"Отменить выбор"</string>
     <string name="deselected" msgid="8488133193326208475">"Выбор отменен"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5d53ff9..72f8d95 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"ප්‍රතික්ෂේප කරන්න"</string>
     <string name="picker_browse" msgid="5554477454636075934">"බ්‍රවුස් කරන්න…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"ක්ලවුඩ් මාධ්‍ය යෙදුම"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"ක්ලවුඩ් මාධ්‍ය යෙදුම"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"ඔබ Android ඡායාරූප තෝරකය තුළ වෙනත් සේවාවලින් උපස්ථ කරන ඡායාරූප සහ වීඩියෝ බෙදා ගන්න"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"මෙයින් ක්ලවුඩ් මාධ්‍ය වෙත ප්‍රවේශ වන්න"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"කිසිවක් නැත"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"එක් කරන්න"</string>
     <string name="deselect" msgid="4297825044827769490">"නොතෝරන්න"</string>
     <string name="deselected" msgid="8488133193326208475">"නොතෝරන ලද"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 71dc505..2cbeaee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Zamietnuť"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Prehliadať…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Ap. na prístup k méd. v cloude"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikácia na prístup k médiám v cloude"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Zdieľanie fotiek a videí, ktoré zálohujete z iných služieb v nástroji Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Získavať prístup k médiám v cloude v aplikácii"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Žiadne"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Pridať"</string>
     <string name="deselect" msgid="4297825044827769490">"Zrušiť výber"</string>
     <string name="deselected" msgid="8488133193326208475">"Výber bol zrušený"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 15995cb..d69e1b2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Zavrni"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Brskanje …"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplikacija za predstavnost v oblaku"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikacija za predstavnost v oblaku"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Delite fotografije in videoposnetke, ki jih varnostno kopirate v drugih storitvah, z Androidovim izbirnikom fotografij."</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Dostop do predstavnosti v oblaku v storitvi"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Brez"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Dodaj"</string>
     <string name="deselect" msgid="4297825044827769490">"Počisti izbiro"</string>
     <string name="deselected" msgid="8488133193326208475">"Izbor je preklican"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index e1787ff..b2ca815 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Refuzo"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Shfleto…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Aplikacioni i medias në renë kompjuterike"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Aplikacioni i medias në renë kompjuterike"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Ndaj fotografitë dhe videot që rezervon nga shërbimet e tjera në Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Qasu te media në renë kompjuterike nga"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Asnjë"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Shto"</string>
     <string name="deselect" msgid="4297825044827769490">"Hiq përzgjedhjen"</string>
     <string name="deselected" msgid="8488133193326208475">"Zgjedhja është hequr"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 67b67f6..1a0ccbb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Одбиј"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Прегледај…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Апликација за медије у клауду"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Апликација за медије у клауду"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Делите слике и видео снимке за које правите резервне копије из других услуга у Android бирачу слика"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Приступајте медијима у клауду из"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Ништа"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Додај"</string>
     <string name="deselect" msgid="4297825044827769490">"Опозови избор"</string>
     <string name="deselected" msgid="8488133193326208475">"Опозван је избор"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f4dfd96..f84a66f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Neka"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Bläddra bland …"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Molnmedieapp"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Molnmedieapp"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Dela foton och videor du säkerhetskopierar från andra tjänster med Androids fotoväljare"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Få tillgång till media i molnet från"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Inga"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Lägg till"</string>
     <string name="deselect" msgid="4297825044827769490">"Avmarkera"</string>
     <string name="deselected" msgid="8488133193326208475">"Avmarkerad"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d09342b..fcfaf11 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"Ruhusu"</string>
     <string name="deny" msgid="6040983710442068936">"Kataa"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Vinjari…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"Programu ya maudhui ya Wingu"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Programu ya maudhui ya kwenye wingu"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Shiriki nakala za picha na video unazohifadhi kutoka katika huduma nyinginezo kwenye Kiteua picha cha Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Fikia maudhui ya kwenye wingu katika"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Hamna"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Weka"</string>
     <string name="deselect" msgid="4297825044827769490">"Acha kuchagua"</string>
     <string name="deselected" msgid="8488133193326208475">"Umeacha kuchagua"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index a41b992..07ad428 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -39,12 +39,15 @@
     <string name="allow" msgid="8885707816848569619">"அனுமதி"</string>
     <string name="deny" msgid="6040983710442068936">"நிராகரி"</string>
     <string name="picker_browse" msgid="5554477454636075934">"உலாவுக…"</string>
-    <!-- no translation found for picker_settings (6443463167344790260) -->
+    <string name="picker_settings" msgid="6443463167344790260">"கிளவுடு மீடியா ஆப்ஸ்"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
     <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"கிளவுடு மீடியா ஆப்ஸ்"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"பிற சேவைகளில் இருந்து காப்புப் பிரதி எடுக்கும் படங்களையும் வீடியோக்களையும் Android ஃபோட்டோ தேர்வுக் கருவி மூலம் பகிரலாம்"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"கிளவுட் மீடியாவை இதிலிருந்து அணுகும்"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"எதுவுமில்லை"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"சேர்"</string>
     <string name="deselect" msgid="4297825044827769490">"தேர்வுநீக்கு"</string>
     <string name="deselected" msgid="8488133193326208475">"தேர்வுநீக்கப்பட்டது"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 0dfc01e..a802b64 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"నిరాకరించండి"</string>
     <string name="picker_browse" msgid="5554477454636075934">"బ్రౌజ్ చేయండి…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"క్లౌడ్ మీడియా యాప్"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"క్లౌడ్ మీడియా యాప్"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"క్లౌడ్ మీడియా యాప్"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android ఫోటోపికర్‌లోని ఇతర సర్వీస్‌ల నుండి మీరు బ్యాకప్ చేసే ఫోటోలు, వీడియోలను షేర్ చేయండి"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"దాని నుండి క్లౌడ్ మీడియాను యాక్సెస్ చేయండి"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ఏవీ లేవు"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"జోడించు"</string>
     <string name="deselect" msgid="4297825044827769490">"ఎంపికను తొలగించండి"</string>
     <string name="deselected" msgid="8488133193326208475">"ఎంపికను తొలగించండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 7124b24..f505ef1 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"ปฏิเสธ"</string>
     <string name="picker_browse" msgid="5554477454636075934">"เรียกดู…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"แอปสื่อในระบบคลาวด์"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"แอปสื่อในระบบคลาวด์"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"แอปสื่อในระบบคลาวด์"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"แชร์รูปภาพและวิดีโอที่คุณสำรองข้อมูลไว้จากบริการอื่นๆ ใน Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"เข้าถึงสื่อในระบบคลาวด์จาก"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"ไม่มี"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"เพิ่ม"</string>
     <string name="deselect" msgid="4297825044827769490">"ยกเลิกการเลือก"</string>
     <string name="deselected" msgid="8488133193326208475">"ยกเลิกการเลือก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 04dcc6f..57fb1a7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Tanggihan"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Mag-browse…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Cloud media app"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Cloud media app"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Magbahagi ng mga larawan at video na na-back up mo mula sa iba pang serbisyo sa Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"I-access ang cloud media sa"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Wala"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Magdagdag"</string>
     <string name="deselect" msgid="4297825044827769490">"I-deselect"</string>
     <string name="deselected" msgid="8488133193326208475">"Na-deselect"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bbce31e..ef07b78 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Reddet"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Göz at…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Bulut medya uygulaması"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Bulut medya uygulaması"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Diğer hizmetlerden yedeklediğiniz fotoğrafları ve videoları Android fotoğraf seçicide paylaşın"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Şuradaki bulut medyasına erişin"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Yok"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Ekle"</string>
     <string name="deselect" msgid="4297825044827769490">"Seçimi kaldır"</string>
     <string name="deselected" msgid="8488133193326208475">"Seçimi kaldırıldı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4e79336..7b6b048 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Заборонити"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Перегляд…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Хмарний мультимедійний додаток"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Хмарний мультимедійний додаток"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Діліться знімками й відео, які ви автоматично завантажуєте з інших сервісів, за допомогою засобу вибору фотографій Android"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Постачальник медіаконтенту з хмари"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Немає"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Додати"</string>
     <string name="deselect" msgid="4297825044827769490">"Не вибирати"</string>
     <string name="deselected" msgid="8488133193326208475">"Не вибрано"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 46d8824..23f0c76 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"مسترد کریں"</string>
     <string name="picker_browse" msgid="5554477454636075934">"براؤز کریں…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"کلاؤڈ میڈیا ایپ"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"کلاؤڈ میڈیا ایپ"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"‏ان تصاویر اور ویڈیوز کا اشتراک کریں جنہیں آپ Android Photopicker میں دیگر سروسز سے بیک اپ کرتے ہیں"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"اس سے کلاؤڈ میڈیا تک رسائی حاصل کریں"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"کوئی نہیں"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"شامل کریں"</string>
     <string name="deselect" msgid="4297825044827769490">"غیر منتخب کریں"</string>
     <string name="deselected" msgid="8488133193326208475">"غیر منتخب کردہ"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f894e72..e47fc5c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Rad etish"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Tanlash…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Bulutli media ilovasi"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Bulutli media ilovasi"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Android Suratni tanlash vositasi orqali boshqa xizmatlarda zaxiralangan rasm va videolarni ulashing"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Bulutli media kontentni ochish"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Hech qanday"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Kiritish"</string>
     <string name="deselect" msgid="4297825044827769490">"Tanlovni bekor qilish"</string>
     <string name="deselected" msgid="8488133193326208475">"Tanlovi yechilgan"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e69893a..604b361 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Từ chối"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Duyệt qua…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"Ứng dụng đa phương tiện trên đám mây"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"Ứng dụng nội dung phương tiện trên đám mây"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Chia sẻ ảnh và video bạn sao lưu qua các dịch vụ khác trong Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Truy cập nội dung phương tiện trên đám mây qua"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Không có"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Thêm"</string>
     <string name="deselect" msgid="4297825044827769490">"Bỏ chọn"</string>
     <string name="deselected" msgid="8488133193326208475">"Đã bỏ chọn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 25f9114..fc8d5f3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"拒绝"</string>
     <string name="picker_browse" msgid="5554477454636075934">"浏览…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"云端媒体应用"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"云端媒体应用"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"在 Android 照片选择器中分享您从其他服务备份的照片和视频"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"从以下位置访问云端媒体:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"无"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"添加"</string>
     <string name="deselect" msgid="4297825044827769490">"取消选择"</string>
     <string name="deselected" msgid="8488133193326208475">"已取消选中"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e9f34a7..5cd48bd 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -40,10 +40,13 @@
     <string name="deny" msgid="6040983710442068936">"拒絕"</string>
     <string name="picker_browse" msgid="5554477454636075934">"瀏覽…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"雲端媒體應用程式"</string>
+    <string name="picker_settings_system_settings_menu_title" msgid="3055084757610063581">"雲端媒體應用程式"</string>
     <string name="picker_settings_title" msgid="5647700706470673258">"雲端媒體應用程式"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"在 Android 相片點選器分享從其他服務備份的相片和影片"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"從以下位置存取雲端媒體:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"無"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"新增"</string>
     <string name="deselect" msgid="4297825044827769490">"取消選取"</string>
     <string name="deselected" msgid="8488133193326208475">"已取消選取"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 87103b8..c15dd79 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"拒絕"</string>
     <string name="picker_browse" msgid="5554477454636075934">"瀏覽…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"雲端媒體應用程式"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"雲端媒體應用程式"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"在 Android 相片挑選工具中分享你從其他服務備份而來的相片和影片"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"從以下位置存取雲端媒體:"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"無"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"新增"</string>
     <string name="deselect" msgid="4297825044827769490">"取消選取"</string>
     <string name="deselected" msgid="8488133193326208475">"已取消選取"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 982ae2e..396f13e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -40,10 +40,14 @@
     <string name="deny" msgid="6040983710442068936">"Nqaba"</string>
     <string name="picker_browse" msgid="5554477454636075934">"Bhrawuza…"</string>
     <string name="picker_settings" msgid="6443463167344790260">"I-app yemidiya ye-cloud"</string>
+    <!-- no translation found for picker_settings_system_settings_menu_title (3055084757610063581) -->
+    <skip />
     <string name="picker_settings_title" msgid="5647700706470673258">"I-app yemidiya ye-cloud"</string>
     <string name="picker_settings_description" msgid="7486394662725656081">"Yabelana ngezithombe namavidiyo owenza ikhophi yasenqolobaneni esuka kwezinye izinsiza ku-Android Photopicker"</string>
     <string name="picker_settings_selection_message" msgid="245453573086488596">"Finyelela imidiya yacloud ukusuka"</string>
     <string name="picker_settings_no_provider" msgid="2582311853680058223">"Lutho"</string>
+    <!-- no translation found for picker_settings_toast_error (697274445512467469) -->
+    <skip />
     <string name="add" msgid="2894574044585549298">"Engeza"</string>
     <string name="deselect" msgid="4297825044827769490">"Susa ukukhetha"</string>
     <string name="deselected" msgid="8488133193326208475">"Okususwe ekukhethweni"</string>
diff --git a/src/com/android/providers/media/DatabaseHelper.java b/src/com/android/providers/media/DatabaseHelper.java
index 1643c20..ae15357 100644
--- a/src/com/android/providers/media/DatabaseHelper.java
+++ b/src/com/android/providers/media/DatabaseHelper.java
@@ -35,7 +35,6 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.mtp.MtpConstants;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
@@ -81,8 +80,6 @@
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -174,8 +171,7 @@
     final String mVolumeName;
     final boolean mEarlyUpgrade;
     final boolean mLegacyProvider;
-    final @Nullable Class<? extends Annotation> mColumnAnnotation;
-    final @Nullable Class<? extends Annotation> mExportedSinceAnnotation;
+    private final ProjectionHelper mProjectionHelper;
     final @Nullable OnSchemaChangeListener mSchemaListener;
     final @Nullable OnFilesChangeListener mFilesListener;
     final @Nullable OnLegacyMigrationListener mMigrationListener;
@@ -247,21 +243,19 @@
 
     public DatabaseHelper(Context context, String name,
             boolean earlyUpgrade, boolean legacyProvider,
-            @Nullable Class<? extends Annotation> columnAnnotation,
-            @Nullable Class<? extends Annotation> exportedSinceAnnotation,
+            ProjectionHelper projectionHelper,
             @Nullable OnSchemaChangeListener schemaListener,
             @Nullable OnFilesChangeListener filesListener,
             @NonNull OnLegacyMigrationListener migrationListener,
             @Nullable UnaryOperator<String> idGenerator, boolean enableNextRowIdRecovery) {
         this(context, name, getDatabaseVersion(context), earlyUpgrade, legacyProvider,
-                columnAnnotation, exportedSinceAnnotation, schemaListener, filesListener,
+               projectionHelper, schemaListener, filesListener,
                 migrationListener, idGenerator, enableNextRowIdRecovery);
     }
 
     public DatabaseHelper(Context context, String name, int version,
             boolean earlyUpgrade, boolean legacyProvider,
-            @Nullable Class<? extends Annotation> columnAnnotation,
-            @Nullable Class<? extends Annotation> exportedSinceAnnotation,
+            ProjectionHelper projectionHelper,
             @Nullable OnSchemaChangeListener schemaListener,
             @Nullable OnFilesChangeListener filesListener,
             @NonNull OnLegacyMigrationListener migrationListener,
@@ -279,8 +273,7 @@
         }
         mEarlyUpgrade = earlyUpgrade;
         mLegacyProvider = legacyProvider;
-        mColumnAnnotation = columnAnnotation;
-        mExportedSinceAnnotation = exportedSinceAnnotation;
+        mProjectionHelper = projectionHelper;
         mSchemaListener = schemaListener;
         mFilesListener = filesListener;
         mMigrationListener = migrationListener;
@@ -782,46 +775,7 @@
         }
     }
 
-    @GuardedBy("mProjectionMapCache")
-    private final ArrayMap<Class<?>, ArrayMap<String, String>>
-            mProjectionMapCache = new ArrayMap<>();
-
-    /**
-     * Return a projection map that represents the valid columns that can be
-     * queried the given contract class. The mapping is built automatically
-     * using the {@link android.provider.Column} annotation, and is designed to
-     * ensure that we always support public API commitments.
-     */
-    public ArrayMap<String, String> getProjectionMap(Class<?>... clazzes) {
-        ArrayMap<String, String> result = new ArrayMap<>();
-        synchronized (mProjectionMapCache) {
-            for (Class<?> clazz : clazzes) {
-                ArrayMap<String, String> map = mProjectionMapCache.get(clazz);
-                if (map == null) {
-                    map = new ArrayMap<>();
-                    try {
-                        for (Field field : clazz.getFields()) {
-                            if (Objects.equals(field.getName(), "_ID") || (mColumnAnnotation != null
-                                    && field.isAnnotationPresent(mColumnAnnotation))) {
-                                boolean shouldIgnoreByOsVersion = shouldBeIgnoredByOsVersion(field);
-                                if (!shouldIgnoreByOsVersion) {
-                                    final String column = (String) field.get(null);
-                                    map.put(column, column);
-                                }
-                            }
-                        }
-                    } catch (ReflectiveOperationException e) {
-                        throw new RuntimeException(e);
-                    }
-                    mProjectionMapCache.put(clazz, map);
-                }
-                result.putAll(map);
-            }
-            return result;
-        }
-    }
-
-    /**
+   /**
      * Local state related to any transaction currently active on a specific
      * thread, such as collecting the set of {@link Uri} that should be notified
      * upon transaction success.
@@ -1573,7 +1527,7 @@
     private void createLatestViews(SQLiteDatabase db) {
         makePristineViews(db);
 
-        if (mColumnAnnotation == null) {
+        if (!mProjectionHelper.hasColumnAnnotation()) {
             Log.w(TAG, "No column annotation provided; not creating views");
             return;
         }
@@ -1678,7 +1632,8 @@
     }
 
     private String getColumnsForCollection(Class<?> collection) {
-        return String.join(",", getProjectionMap(collection).keySet()) + ",_modifier";
+        return String.join(",", mProjectionHelper.getProjectionMap(collection).keySet())
+                + ",_modifier";
     }
 
     private static void makePristineTriggers(SQLiteDatabase db) {
@@ -2395,31 +2350,6 @@
         }
     }
 
-    private boolean shouldBeIgnoredByOsVersion(@NonNull Field field) {
-        if (mExportedSinceAnnotation == null) {
-            return false;
-        }
-
-        if (!field.isAnnotationPresent(mExportedSinceAnnotation)) {
-            return false;
-        }
-
-        try {
-            final Annotation annotation = field.getAnnotation(mExportedSinceAnnotation);
-            final int exportedSinceOSVersion = (int) annotation.annotationType().getMethod(
-                    "osVersion").invoke(annotation);
-            final boolean shouldIgnore = exportedSinceOSVersion > Build.VERSION.SDK_INT;
-            if (shouldIgnore) {
-                Log.d(TAG, "Ignoring column " + field.get(null) + " with version "
-                        + exportedSinceOSVersion + " in OS version " + Build.VERSION.SDK_INT);
-            }
-            return shouldIgnore;
-        } catch (Exception e) {
-            Log.e(TAG, "Can't parse the OS version in ExportedSince annotation", e);
-            return false;
-        }
-    }
-
     /**
      * Return the current generation that will be populated into
      * {@link MediaColumns#GENERATION_ADDED} or
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 2946aad..298a97b 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -118,7 +118,6 @@
 import android.app.PendingIntent;
 import android.app.RecoverableSecurityException;
 import android.app.RemoteAction;
-import android.app.admin.DevicePolicyManager;
 import android.app.compat.CompatChanges;
 import android.compat.annotation.ChangeId;
 import android.compat.annotation.EnabledAfter;
@@ -1063,12 +1062,12 @@
         mThumbSize = new Size(thumbSize, thumbSize);
 
         mMediaScanner = new ModernMediaScanner(context);
-
+        mProjectionHelper = new ProjectionHelper(Column.class, ExportedSince.class);
         mInternalDatabase = new DatabaseHelper(context, INTERNAL_DATABASE_NAME, false, false,
-                Column.class, ExportedSince.class, Metrics::logSchemaChange, mFilesListener,
+                mProjectionHelper, Metrics::logSchemaChange, mFilesListener,
                 MIGRATION_LISTENER, mIdGenerator, true);
         mExternalDatabase = new DatabaseHelper(context, EXTERNAL_DATABASE_NAME, false, false,
-                Column.class, ExportedSince.class, Metrics::logSchemaChange, mFilesListener,
+                mProjectionHelper, Metrics::logSchemaChange, mFilesListener,
                 MIGRATION_LISTENER, mIdGenerator, true);
         mExternalDbFacade = new ExternalDbFacade(getContext(), mExternalDatabase, mVolumeCache);
         mPickerDbFacade = new PickerDbFacade(context);
@@ -1076,7 +1075,7 @@
         mConfigStore = createConfigStore();
         mPickerSyncController = new PickerSyncController(context, mPickerDbFacade, mConfigStore);
         mPickerDataLayer = new PickerDataLayer(context, mPickerDbFacade, mPickerSyncController);
-        mPickerUriResolver = new PickerUriResolver(context, mPickerDbFacade);
+        mPickerUriResolver = new PickerUriResolver(context, mPickerDbFacade, mProjectionHelper);
 
         mDatabaseBackupAndRecovery = createDatabaseBackupAndRecovery();
 
@@ -10404,6 +10403,7 @@
 
     private MediaScanner mMediaScanner;
 
+    private ProjectionHelper mProjectionHelper;
     private DatabaseHelper mInternalDatabase;
     private DatabaseHelper mExternalDatabase;
     private PickerDbFacade mPickerDbFacade;
@@ -10664,7 +10664,7 @@
     }
 
     public ArrayMap<String, String> getProjectionMap(Class<?>... clazzes) {
-        return mExternalDatabase.getProjectionMap(clazzes);
+        return mProjectionHelper.getProjectionMap(clazzes);
     }
 
     static <T> boolean containsAny(Set<T> a, Set<T> b) {
diff --git a/src/com/android/providers/media/PickerUriResolver.java b/src/com/android/providers/media/PickerUriResolver.java
index b398c1d..17a8ca9 100644
--- a/src/com/android/providers/media/PickerUriResolver.java
+++ b/src/com/android/providers/media/PickerUriResolver.java
@@ -47,6 +47,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Utility class for Picker Uris, it handles (includes permission checks, incoming args
@@ -75,10 +76,12 @@
 
     private final Context mContext;
     private final PickerDbFacade mDbFacade;
+    private final ProjectionHelper mProjectionHelper;
 
-    PickerUriResolver(Context context, PickerDbFacade dbFacade) {
+    PickerUriResolver(Context context, PickerDbFacade dbFacade, ProjectionHelper projectionHelper) {
         mContext = context;
         mDbFacade = dbFacade;
+        mProjectionHelper = projectionHelper;
     }
 
     public ParcelFileDescriptor openFile(Uri uri, String mode, CancellationSignal signal,
@@ -303,25 +306,15 @@
             return;
         }
 
+        Set<String> validProjectionColumns = mProjectionHelper.getProjectionMap(
+                MediaStore.PickerMediaColumns.class).keySet();
         for (String column : projection) {
-            switch (column) {
-                // TODO (b/251427354): Create a list for all valid PickerMediaColumns
-                case MediaStore.PickerMediaColumns.DATA:
-                case MediaStore.PickerMediaColumns.DISPLAY_NAME:
-                case MediaStore.PickerMediaColumns.MIME_TYPE:
-                case MediaStore.PickerMediaColumns.DATE_TAKEN:
-                case MediaStore.PickerMediaColumns.SIZE:
-                case MediaStore.PickerMediaColumns.DURATION_MILLIS:
-                case MediaStore.PickerMediaColumns.HEIGHT:
-                case MediaStore.PickerMediaColumns.WIDTH:
-                case MediaStore.PickerMediaColumns.ORIENTATION:
-                    break;
-                default:
-                    final PhotoPickerUiEventLogger logger = new PhotoPickerUiEventLogger();
-                    logger.logPickerQueriedWithUnknownColumn(callingUid, callingPackageName);
+            if (!validProjectionColumns.contains(column)) {
+                final PhotoPickerUiEventLogger logger = new PhotoPickerUiEventLogger();
+                logger.logPickerQueriedWithUnknownColumn(callingUid, callingPackageName);
 
-                    throw new IllegalArgumentException("Unexpected picker URI projection. Uri:"
-                            + uri + ". Column: " + column);
+                throw new IllegalArgumentException("Unexpected picker URI projection. Uri:"
+                        + uri + ". Column: " + column);
             }
         }
     }
diff --git a/src/com/android/providers/media/ProjectionHelper.java b/src/com/android/providers/media/ProjectionHelper.java
new file mode 100644
index 0000000..00f5fa2
--- /dev/null
+++ b/src/com/android/providers/media/ProjectionHelper.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.providers.media;
+
+import android.os.Build;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.Objects;
+
+/**
+ * Utility class to handle projection columns across releases, database agnostic.
+ */
+public class ProjectionHelper {
+
+    private static final String TAG = "ProjectionHelper";
+    @Nullable
+    private final Class<? extends Annotation> mColumnAnnotation;
+    @Nullable
+    private final Class<? extends Annotation> mExportedSinceAnnotation;
+
+    public ProjectionHelper(@Nullable Class<? extends Annotation> columnAnnotation,
+            @Nullable Class<? extends Annotation> exportedSinceAnnotation) {
+        mColumnAnnotation = columnAnnotation;
+        mExportedSinceAnnotation = exportedSinceAnnotation;
+    }
+
+    @GuardedBy("mProjectionMapCache")
+    private final ArrayMap<Class<?>, ArrayMap<String, String>>
+            mProjectionMapCache = new ArrayMap<>();
+
+    /**
+     * Return a projection map that represents the valid columns that can be
+     * queried the given contract class. The mapping is built automatically
+     * using the {@link android.provider.Column} annotation, and is designed to
+     * ensure that we always support public API commitments.
+     */
+    public ArrayMap<String, String> getProjectionMap(Class<?>... clazzes) {
+        ArrayMap<String, String> result = new ArrayMap<>();
+        synchronized (mProjectionMapCache) {
+            for (Class<?> clazz : clazzes) {
+                ArrayMap<String, String> map = mProjectionMapCache.get(clazz);
+                if (map == null) {
+                    map = new ArrayMap<>();
+                    try {
+                        for (Field field : clazz.getFields()) {
+                            if (Objects.equals(field.getName(), "_ID") || (mColumnAnnotation != null
+                                    && field.isAnnotationPresent(mColumnAnnotation))) {
+                                boolean shouldIgnoreByOsVersion = shouldBeIgnoredByOsVersion(field);
+                                if (!shouldIgnoreByOsVersion) {
+                                    final String column = (String) field.get(null);
+                                    map.put(column, column);
+                                }
+                            }
+                        }
+                    } catch (ReflectiveOperationException e) {
+                        throw new RuntimeException(e);
+                    }
+                    mProjectionMapCache.put(clazz, map);
+                }
+                result.putAll(map);
+            }
+            return result;
+        }
+    }
+
+    private boolean shouldBeIgnoredByOsVersion(@NonNull Field field) {
+        if (mExportedSinceAnnotation == null) {
+            return false;
+        }
+
+        if (!field.isAnnotationPresent(mExportedSinceAnnotation)) {
+            return false;
+        }
+
+        try {
+            final Annotation annotation = field.getAnnotation(mExportedSinceAnnotation);
+            final int exportedSinceOSVersion = (int) annotation.annotationType().getMethod(
+                    "osVersion").invoke(annotation);
+            final boolean shouldIgnore = exportedSinceOSVersion > Build.VERSION.SDK_INT;
+            if (shouldIgnore) {
+                Log.d(TAG, "Ignoring column " + field.get(null) + " with version "
+                        + exportedSinceOSVersion + " in OS version " + Build.VERSION.SDK_INT);
+            }
+            return shouldIgnore;
+        } catch (Exception e) {
+            Log.e(TAG, "Can't parse the OS version in ExportedSince annotation", e);
+            return false;
+        }
+    }
+
+    /**
+     * @return whether a column annotation has been defined for the helper.
+     */
+    public boolean hasColumnAnnotation() {
+        return mColumnAnnotation != null;
+    }
+}
diff --git a/src/com/android/providers/media/photopicker/PhotoPickerProvider.java b/src/com/android/providers/media/photopicker/PhotoPickerProvider.java
index 79f7326..c71f600 100644
--- a/src/com/android/providers/media/photopicker/PhotoPickerProvider.java
+++ b/src/com/android/providers/media/photopicker/PhotoPickerProvider.java
@@ -45,7 +45,6 @@
 import com.android.providers.media.PickerUriResolver;
 import com.android.providers.media.photopicker.data.CloudProviderQueryExtras;
 import com.android.providers.media.photopicker.data.ExternalDbFacade;
-import com.android.providers.media.photopicker.ui.remotepreview.RemotePreviewHandler;
 
 
 import java.io.FileNotFoundException;
@@ -137,10 +136,6 @@
     @Nullable
     public CloudMediaSurfaceController onCreateCloudMediaSurfaceController(@NonNull Bundle config,
             CloudMediaSurfaceStateChangedCallback callback) {
-        if (!RemotePreviewHandler.isRemotePreviewEnabled()) {
-            return null;
-        }
-
         // The config has all parameters except the |callback|, so marshall that into the config
         config.putBinder(EXTRA_SURFACE_STATE_CALLBACK, callback.getIBinder());
         // Add the local provider authority so the RemoteVideoPreviewProvider knows who to forward
diff --git a/src/com/android/providers/media/photopicker/ui/remotepreview/RemotePreviewHandler.java b/src/com/android/providers/media/photopicker/ui/remotepreview/RemotePreviewHandler.java
index d1b067c..b07fc9b 100644
--- a/src/com/android/providers/media/photopicker/ui/remotepreview/RemotePreviewHandler.java
+++ b/src/com/android/providers/media/photopicker/ui/remotepreview/RemotePreviewHandler.java
@@ -32,7 +32,6 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.RemoteException;
-import android.os.SystemProperties;
 import android.provider.CloudMediaProvider.CloudMediaSurfaceStateChangedCallback.PlaybackState;
 import android.provider.ICloudMediaSurfaceController;
 import android.provider.ICloudMediaSurfaceStateChangedCallback;
@@ -77,13 +76,6 @@
     private boolean mIsInBackground = false;
     private int mSurfaceCounter = 0;
 
-    /**
-     * Returns {@code true} if remote preview is enabled.
-     */
-    public static boolean isRemotePreviewEnabled() {
-        return SystemProperties.getBoolean("sys.photopicker.remote_preview", true);
-    }
-
     public RemotePreviewHandler(Context context, MuteStatus muteStatus) {
         mContext = context;
         mMuteStatus = muteStatus;
diff --git a/tests/src/com/android/providers/media/DatabaseHelperTest.java b/tests/src/com/android/providers/media/DatabaseHelperTest.java
index ece5315..572d2f5 100644
--- a/tests/src/com/android/providers/media/DatabaseHelperTest.java
+++ b/tests/src/com/android/providers/media/DatabaseHelperTest.java
@@ -71,6 +71,7 @@
 
     private static Context sIsolatedContext;
     private static ContentResolver sIsolatedResolver;
+    private static ProjectionHelper sProjectionHelper;
 
     @Before
     public void setUp() {
@@ -79,6 +80,7 @@
         final Context context = InstrumentationRegistry.getTargetContext();
         sIsolatedContext = new IsolatedContext(context, TAG, /*asFuseThread*/ false);
         sIsolatedResolver = sIsolatedContext.getContentResolver();
+        sProjectionHelper = new ProjectionHelper(Column.class, ExportedSince.class);
     }
 
     @Test
@@ -687,8 +689,8 @@
 
     private static class DatabaseHelperO extends DatabaseHelper {
         public DatabaseHelperO(Context context, String name) {
-            super(context, name, DatabaseHelper.VERSION_O, false, false, Column.class,
-                    ExportedSince.class, null, null, null, null, false);
+            super(context, name, DatabaseHelper.VERSION_O, false, false, sProjectionHelper, null,
+                    null, null, null, false);
         }
 
         @Override
@@ -699,8 +701,8 @@
 
     private static class DatabaseHelperP extends DatabaseHelper {
         public DatabaseHelperP(Context context, String name) {
-            super(context, name, DatabaseHelper.VERSION_P, false, false, Column.class,
-                    ExportedSince.class, null, null, null, null, false);
+            super(context, name, DatabaseHelper.VERSION_P, false, false, sProjectionHelper, null,
+                    null, null, null, false);
         }
 
         @Override
@@ -711,8 +713,8 @@
 
     private static class DatabaseHelperQ extends DatabaseHelper {
         public DatabaseHelperQ(Context context, String name) {
-            super(context, name, DatabaseHelper.VERSION_Q, false, false, Column.class,
-                    ExportedSince.class, null, null, null, null, false);
+            super(context, name, DatabaseHelper.VERSION_Q, false, false, sProjectionHelper, null,
+                    null, null, null, false);
         }
 
         @Override
@@ -723,8 +725,8 @@
 
     private static class DatabaseHelperR extends DatabaseHelper {
         public DatabaseHelperR(Context context, String name) {
-            super(context, name, DatabaseHelper.VERSION_R, false, false, Column.class,
-                    ExportedSince.class, null, null, MediaProvider.MIGRATION_LISTENER, null, false);
+            super(context, name, DatabaseHelper.VERSION_R, false, false, sProjectionHelper, null,
+                    null, MediaProvider.MIGRATION_LISTENER, null, false);
         }
 
         @Override
@@ -735,7 +737,7 @@
 
     private static class DatabaseHelperS extends DatabaseHelper {
         public DatabaseHelperS(Context context, String name) {
-            super(context, name, VERSION_S, false, false, Column.class, ExportedSince.class, null,
+            super(context, name, VERSION_S, false, false, sProjectionHelper, null,
                     null, MediaProvider.MIGRATION_LISTENER, null, false);
         }
 
@@ -748,8 +750,8 @@
 
     private static class DatabaseHelperT extends DatabaseHelper {
         public DatabaseHelperT(Context context, String name) {
-            super(context, name, DatabaseHelper.VERSION_T, false, false, Column.class,
-                    ExportedSince.class, null, null, MediaProvider.MIGRATION_LISTENER, null, false);
+            super(context, name, DatabaseHelper.VERSION_T, false, false, sProjectionHelper, null,
+                    null, MediaProvider.MIGRATION_LISTENER, null, false);
         }
 
         @Override
@@ -765,8 +767,8 @@
 
     private static class DatabaseHelperU extends DatabaseHelper {
         public DatabaseHelperU(Context context, String name) {
-            super(context, name, DatabaseHelper.VERSION_U, false, false, Column.class,
-                    ExportedSince.class, null, null, MediaProvider.MIGRATION_LISTENER, null, false);
+            super(context, name, DatabaseHelper.VERSION_U, false, false, sProjectionHelper, null,
+                    null, MediaProvider.MIGRATION_LISTENER, null, false);
         }
 
         @Override
diff --git a/tests/src/com/android/providers/media/PickerUriResolverTest.java b/tests/src/com/android/providers/media/PickerUriResolverTest.java
index 8910160..c3b0990 100644
--- a/tests/src/com/android/providers/media/PickerUriResolverTest.java
+++ b/tests/src/com/android/providers/media/PickerUriResolverTest.java
@@ -41,6 +41,8 @@
 import android.os.ParcelFileDescriptor;
 import android.os.UserHandle;
 import android.provider.CloudMediaProviderContract;
+import android.provider.Column;
+import android.provider.ExportedSince;
 import android.provider.MediaStore;
 
 import androidx.test.InstrumentationRegistry;
@@ -75,7 +77,8 @@
 
     private static class TestPickerUriResolver extends PickerUriResolver {
         TestPickerUriResolver(Context context) {
-            super(context, new PickerDbFacade(getTargetContext()));
+            super(context, new PickerDbFacade(getTargetContext()),
+                    new ProjectionHelper(Column.class, ExportedSince.class));
         }
 
         @Override
diff --git a/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java b/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java
index 7da9775..6b8b09d 100644
--- a/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java
+++ b/tests/src/com/android/providers/media/photopicker/data/ExternalDbFacadeTest.java
@@ -50,6 +50,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.providers.media.DatabaseHelper;
+import com.android.providers.media.ProjectionHelper;
 import com.android.providers.media.VolumeCache;
 import com.android.providers.media.scan.MediaScannerTest.IsolatedContext;
 
@@ -916,8 +917,8 @@
 
     private static class TestDatabaseHelper extends DatabaseHelper {
         public TestDatabaseHelper(Context context) {
-            super(context, TEST_CLEAN_DB, 1, false, false, null, null, null, null, null, null,
-                    false);
+            super(context, TEST_CLEAN_DB, 1, false, false, new ProjectionHelper(null, null), null,
+                    null, null, null, false);
         }
     }
 }
diff --git a/tests/src/com/android/providers/media/photopicker/data/PickerDbFacadeTest.java b/tests/src/com/android/providers/media/photopicker/data/PickerDbFacadeTest.java
index abc3731..fc86378 100644
--- a/tests/src/com/android/providers/media/photopicker/data/PickerDbFacadeTest.java
+++ b/tests/src/com/android/providers/media/photopicker/data/PickerDbFacadeTest.java
@@ -30,11 +30,15 @@
 import android.database.MatrixCursor;
 import android.provider.CloudMediaProviderContract.AlbumColumns;
 import android.provider.CloudMediaProviderContract.MediaColumns;
+import android.provider.Column;
+import android.provider.ExportedSince;
 import android.provider.MediaStore.PickerMediaColumns;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.providers.media.ProjectionHelper;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -65,6 +69,7 @@
 
     private PickerDbFacade mFacade;
     private Context mContext;
+    private ProjectionHelper mProjectionHelper;
 
     @Before
     public void setUp() {
@@ -73,6 +78,7 @@
         dbPath.delete();
         mFacade = new PickerDbFacade(mContext, LOCAL_PROVIDER);
         mFacade.setCloudProvider(CLOUD_PROVIDER);
+        mProjectionHelper = new ProjectionHelper(Column.class, ExportedSince.class);
     }
 
     @Test
@@ -718,18 +724,8 @@
         assertAddMediaOperation(CLOUD_PROVIDER, cloudCursor, 1);
 
         // Assert all projection columns
-        final String[] allProjection = new String[] {
-                PickerMediaColumns.DISPLAY_NAME,
-                PickerMediaColumns.DATA,
-                PickerMediaColumns.MIME_TYPE,
-                PickerMediaColumns.DATE_TAKEN,
-                PickerMediaColumns.SIZE,
-                PickerMediaColumns.DURATION_MILLIS,
-                PickerMediaColumns.HEIGHT,
-                PickerMediaColumns.WIDTH,
-                PickerMediaColumns.ORIENTATION
-        };
-
+        final String[] allProjection = mProjectionHelper.getProjectionMap(
+                PickerMediaColumns.class).keySet().toArray(new String[0]);
         try (Cursor cr = mFacade.queryMediaIdForApps(LOCAL_PROVIDER, LOCAL_ID,
                         allProjection)) {
             assertThat(cr.getCount()).isEqualTo(1);