diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 8193af89d049977c2fbe4355f61799135c6895b6..946c29eab125b93ee00f41a8ab5d0fc97a79a6d2 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -70,6 +70,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minutu</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutos</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
     <string name="auto_brightness_one_shot_title">Brillu automáticu namás una vegada</string>
     <string name="auto_brightness_one_shot_summary">L\'axuste del brillu namás se produz nel momentu que la pantalla se prenda</string>
@@ -91,10 +92,10 @@
     <string name="wake_when_plugged_or_unplugged_summary">Priende la pantalla al des/espatar el preséu d\'una fonte llétrica</string>
     <string name="fast_charging_title">Carga rápida</string>
     <string name="fast_charging_summary">Desactiva esta opción p\'amenorgar la calor producida pol preséu mentanto carga y aumentar la vida útil de la batería</string>
-    <string name="ambient_display_screen_off_udfps_title" product="default">Ten primíu\'l sensor de buelgues pa desbloquiar el teléfonu</string>
-    <string name="ambient_display_screen_off_udfps_title" product="tablet">Ten primíu\'l sensor de buelgues pa desbloquiar la tableta</string>
-    <string name="ambient_display_screen_off_udfps_title" product="device">Ten primíu\'l sensor de buelgues pa desbloquiar el preséu</string>
+    <string name="ambient_display_screen_off_udfps_title" product="default">Tener primíu\'l sensor de buelgues desbloquia\'l teléfonu</string>
+    <string name="ambient_display_screen_off_udfps_title" product="tablet">Tener primíu\'l sensor de buelgues desbloquia la tableta</string>
+    <string name="ambient_display_screen_off_udfps_title" product="device">Tener primíu\'l sensor de buelgues desbloquia\'l preséu</string>
     <string name="ambient_display_screen_off_udfps_summary">Pa esconsoñar la pantalla y desbloquiar el preséu, ten primío sobre\'l sensor de buelgues que ta so la pantalla.</string>
     <string name="storage_warning_internal">Alvertencia: ¡ye posible qu\'esta opción nun funcione afayadizamente o provoque la perda de datos, y polo tanto, nun s\'aconseya!</string>
-    <string name="assisted_gps_summary">Baxa los datos d\'asistencia satelitales d\'internet que puen ameyorar muncho\'l rindimientu inicial del GPS. Pa les llamaes d\'emerxencia, el GPS asistíu permítese siempres.</string>
+    <string name="assisted_gps_summary">Baxa los datos d\'asistencia satelitales d\'internet que puen ameyorar muncho\'l rindimientu inicial del GPS. Pa les llamaes d\'emerxencia, el GPS asistíu permítese siempre.</string>
 </resources>
diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
index bc25e23cb984d73fd098e7b3fa4e8bd49dc627f0..bd1774194dfb0c7b1b127d72c5d9c8352934ab37 100644
--- a/res/values-az/cm_strings.xml
+++ b/res/values-az/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 saniyə</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 dəqiqə</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 dəqiqə</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 dəqiqə</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 dəqiqə</string>
     <string name="auto_brightness_one_shot_title">Tək çəkilişdə avto-parlaqlıq</string>
     <string name="auto_brightness_one_shot_summary">Parlaqlıq nizamı yalnız ekran açılanda icra edilir</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 163d4dbe3c21d9f9c59706c81c07cdf5117808f5..1232ef97088b5eb7286c3b12c670b96aa247e0e5 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 segons</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minut</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minuts</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minuts</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minuts</string>
     <string name="auto_brightness_one_shot_title">Ajusta la lluentor una sola vegada</string>
     <string name="auto_brightness_one_shot_summary">L\'ajust de la lluentor només es produirà en el moment que la pantalla estigui encesa</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index e5d04526431d20ab88407b3faa3865806d0e5234..cdfd9eecbff2c2ef51272acc25579105fec1d8ee 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 Sekunden</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 Minute</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 Minuten</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 Minuten</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 Minuten</string>
     <string name="auto_brightness_one_shot_title">Einmalige automatische Helligkeitseinstellung</string>
     <string name="auto_brightness_one_shot_summary">Helligkeitsanpassung erfolgt nur beim Einschalten des Bildschirms</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 23099b373bbfd206bcacf01768e479f748f7b7c1..8796a22f8852d6584d3975784f828a0741f53d11 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 δευτερόλεπτα</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 λεπτό</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 λεπτά</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 λεπτά</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 λεπτά</string>
     <string name="auto_brightness_one_shot_title">Αυτόματη φωτεινότητα με μία λήψη</string>
     <string name="auto_brightness_one_shot_summary">Η ρύθμιση φωτεινότητας θα πραγματοποιηθεί μόνο τη στιγμή που ενεργοποιείται η οθόνη</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index f6c2865b8f9b53d305587ca4cb888d5a08ecfe9c..d9c4fec46f51de47e1162f4afb768fa4d9756ba0 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutes</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
     <string name="auto_brightness_one_shot_title">One shot auto-brightness</string>
     <string name="auto_brightness_one_shot_summary">Brightness adjustment will only occur at the moment the screen is turned on</string>
diff --git a/res/values-en-rCA/cm_strings.xml b/res/values-en-rCA/cm_strings.xml
index f6c2865b8f9b53d305587ca4cb888d5a08ecfe9c..d9c4fec46f51de47e1162f4afb768fa4d9756ba0 100644
--- a/res/values-en-rCA/cm_strings.xml
+++ b/res/values-en-rCA/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutes</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
     <string name="auto_brightness_one_shot_title">One shot auto-brightness</string>
     <string name="auto_brightness_one_shot_summary">Brightness adjustment will only occur at the moment the screen is turned on</string>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index d26fa83ddc6fed61d294d59d90bc1a744dfa19f4..c6ad1c1b7a84d834fcd6c23ebd1fc59bcc9f947e 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutes</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
     <string name="auto_brightness_one_shot_title">One shot auto-brightness</string>
     <string name="auto_brightness_one_shot_summary">Brightness adjustment will only occur at the moment the screen is turned on</string>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index f6c2865b8f9b53d305587ca4cb888d5a08ecfe9c..d9c4fec46f51de47e1162f4afb768fa4d9756ba0 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutes</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
     <string name="auto_brightness_one_shot_title">One shot auto-brightness</string>
     <string name="auto_brightness_one_shot_summary">Brightness adjustment will only occur at the moment the screen is turned on</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 7f74e73a8b79da2a8fd3a53ff6dc29f4507f14d7..539c016c08042527fe4381e1bc7cf51627fd1a39 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -15,35 +15,60 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="keyboard_extras_title">Extras</string>
+    <string name="advanced_keyboard_settings_title">Configuración avanzada</string>
     <string name="adb_enable_root">Depuración como Superusuario</string>
     <string name="adb_enable_summary_root">Permitir ejecutar la depuración de Android como Superusuario</string>
-    <string name="backup_transport_setting_label">Cambiar proveedor de la copia de seguridad</string>
-    <string name="backup_transport_title">Seleccionar el proveedor de la copia de seguridad</string>
+    <string name="backup_transport_setting_label">Cambiar de proveedor de copias de seguridad</string>
+    <string name="backup_transport_title">Seleccionar el proveedor de copias de seguridad</string>
     <string name="berry_black_theme_title">Negro puro</string>
     <string name="berry_black_theme_summary">Fondo negro puro para el tema oscuro</string>
     <string name="lineagelicense_title">Licencia de LineageOS</string>
+    <string name="device_info_protected_single_press">Toca para mostrar información</string>
     <plurals name="show_dev_countdown_cm">
         <item quantity="one">Ahora estás a <xliff:g id="step_count">%1$d</xliff:g> paso de habilitar las opciones de desarrollo.</item>
         <item quantity="other">Ahora estás a <xliff:g id="step_count">%1$d</xliff:g> pasos de habilitar las opciones de desarrollo.</item>
     </plurals>
-    <string name="show_dev_on_cm">¡Has activado los ajustes de desarrollo!</string>
-    <string name="show_dev_already_cm">No es necesario. Las opciones de desarrollo ya están activadas.</string>
-    <string name="peak_refresh_rate_summary_custom">Aumenta automáticamente la frecuencia de actualización de 60 a %1$d Hz en determinados tipos de contenido. Se usará más batería.</string>
+    <string name="show_dev_on_cm">¡Has activado las opciones para desarrolladores!</string>
+    <string name="show_dev_already_cm">No es necesario, ya has activado las opciones para desarrolladores.</string>
+    <string name="peak_refresh_rate_summary_custom">Aumenta automáticamente la frecuencia de actualización de 60 a %1$d Hz para algunos contenidos. Aumenta el consumo de batería.</string>
     <string name="status_bar_double_tap_to_sleep_title">Pulsar para suspender</string>
     <string name="status_bar_double_tap_to_sleep_summary">Doble toque en la barra de estado o pantalla de bloqueo para apagar la pantalla</string>
+    <string name="high_touch_polling_rate_title">Tasa alta de muestreo táctil</string>
+    <string name="high_touch_polling_rate_summary">Aumentar la tasa de muestreo táctil</string>
     <string name="heads_up_notifications_enabled_title">Notificaciones emergentes</string>
     <string name="heads_up_notifications_enabled_summary">Mostrar las notificaciones prioritarias en una pequeña ventana flotante</string>
     <string name="high_touch_sensitivity_title">Alta sensibilidad táctil</string>
-    <string name="high_touch_sensitivity_summary">Incrementar la sensibilidad del panel táctil para que pueda usarse llevando guantes</string>
+    <string name="high_touch_sensitivity_summary">Aumenta la sensibilidad de la pantalla táctil para poder utilizarla con guantes</string>
     <string name="tethering_allow_vpn_upstreams_title">Permitir a los clientes usar VPNs</string>
     <string name="tethering_allow_vpn_upstreams_summary">Permitir a los clientes de hotspot usar las conexiones VPN de este dispositivo\u2019 como conectividad principal</string>
-    <string name="increasing_ring_volume_option_title">Volumen de timbre ascendente</string>
+    <string name="increasing_ring_volume_option_title">Tono de llamada con volumen ascendente</string>
     <string name="increasing_ring_min_volume_title">Volumen inicial</string>
     <string name="increasing_ring_ramp_up_time_title">Tiempo de incremento</string>
     <string name="lockscreen_media_art_title">Mostrar portada del álbum</string>
-    <string name="lock_settings_picker_pattern_size_message">Elije un tamaño de patrón</string>
+    <string name="lock_settings_picker_pattern_size_message">Elige un tamaño de patrón</string>
     <string name="lockpattern_settings_enable_error_path_title">Mostrar patrón erróneo</string>
     <string name="lockpattern_settings_enable_dots_title">Mostrar puntos de patrón</string>
+    <string name="max_refresh_rate_title">Frecuencia máxima de actualización</string>
+    <string name="min_refresh_rate_title">Tasa mínima de refresco</string>
+    <string name="fingerprint_enroll_find_sensor_message_front" product="tablet">Localiza el lector de huellas en el frontal de tu tableta.</string>
+    <string name="fingerprint_enroll_find_sensor_message_front" product="device">Localiza el lector de huellas en el frontal de tu dispositivo.</string>
+    <string name="fingerprint_enroll_find_sensor_message_front" product="default">Localiza el lector de huellas en el frontal de tu teléfono.</string>
+    <string name="fingerprint_enroll_find_sensor_message_rear" product="tablet">Localiza el lector de huellas en la parte trasera de tu tableta.</string>
+    <string name="fingerprint_enroll_find_sensor_message_rear" product="device">Localiza el lector de huellas en la parte trasera de tu dispositivo.</string>
+    <string name="fingerprint_enroll_find_sensor_message_rear" product="default">Localiza el lector de huellas en la parte trasera de tu teléfono.</string>
+    <string name="fingerprint_enroll_find_sensor_message_side" product="tablet">Localiza el lector de huellas en la parte lateral de tu tableta.</string>
+    <string name="fingerprint_enroll_find_sensor_message_side" product="device">Localiza el lector de huellas en lateral de tu dispositivo.</string>
+    <string name="fingerprint_enroll_find_sensor_message_side" product="default">Localiza el lector de huellas en el lateral de tu teléfono.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_front" product="tablet">Toca el sensor en la parte frontal de tu tableta.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_front" product="device">Toca el sensor en la parte frontal de tu dispositivo.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_front" product="default">Toca el sensor en la parte frontal de tu teléfono.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_rear" product="tablet">Toca el sensor en la parte trasera de tu tableta.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_rear" product="device">Toca el sensor de la parte trasera de tu dispositivo.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_rear" product="default">Toca el sensor en la parte trasera de tu teléfono.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_side" product="tablet">Toca el sensor en la parte lateral de tu tableta.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_side" product="device">Toca el sensor en la parte lateral de tu dispositivo.</string>
+    <string name="fingerprint_enroll_touch_dialog_message_side" product="default">Toca el sensor en la parte lateral de tu teléfono.</string>
     <string name="show_navbar_hint_title">Sugerencia de navegación</string>
     <string name="show_navbar_hint_summary">Mostrar barra de sugerencias de navegación en la parte inferior de la pantalla</string>
     <string name="app_notification_sound_timeout_title">Tiempo mínimo entre sonidos de notificaciones</string>
@@ -53,17 +78,34 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutos</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
+    <string name="auto_brightness_one_shot_title">Brillo automático en un toque</string>
+    <string name="auto_brightness_one_shot_summary">El brillo solo se ajustará en el momento de encender la pantalla</string>
     <string name="data_usage_app_restrict_all">Permitir acceso a la red</string>
     <string name="data_usage_app_restrict_all_summary">Habilitar uso de red</string>
+    <string name="data_usage_app_restrict_mobile">Datos móviles</string>
+    <string name="data_usage_app_restrict_mobile_summary">Habilitar uso de datos móviles</string>
+    <string name="data_usage_app_restrict_vpn">Datos con VPN</string>
+    <string name="data_usage_app_restrict_vpn_summary">Habilitar uso de datos con VPN</string>
+    <string name="data_usage_app_restrict_wifi">Datos Wi\u2011Fi</string>
+    <string name="data_usage_app_restrict_wifi_summary">Habilitar el uso de datos Wi\u2011Fi</string>
     <string name="unlock_scramble_pin_layout_title">Disposición aleatoria</string>
     <string name="unlock_scramble_pin_layout_summary">Cambiar la disposición de los números del PIN para desbloquear el dispositivo</string>
     <string name="proximity_wake_title">Prevenir encendido accidental</string>
     <string name="proximity_wake_summary">Comprobar el sensor de proximidad antes de encender la pantalla</string>
-    <string name="touchscreen_gesture_settings_title">Gestos en pantalla táctil</string>
+    <string name="touchscreen_gesture_settings_title">Gestos en la pantalla táctil</string>
     <string name="touchscreen_gesture_settings_summary">Realizar varios gestos en la pantalla para acciones rápidas</string>
-    <string name="touchscreen_hovering_title">Pantalla táctil deslizante</string>
-    <string name="touchscreen_hovering_summary">Te permitirá deslizar por la pantalla como un ratón en navegadores, escritorios remotos, etc.</string>
+    <string name="touchscreen_hovering_title">Pantalla táctil flotante</string>
+    <string name="touchscreen_hovering_summary">Permite desplazarte por la pantalla como un ratón en navegadores, escritorios remotos, etc.</string>
     <string name="wake_when_plugged_or_unplugged_title">Encender al conectar el cargador</string>
     <string name="wake_when_plugged_or_unplugged_summary">Encender la pantalla al conectar o desconectar el cargador</string>
+    <string name="fast_charging_title">Carga rápida</string>
+    <string name="fast_charging_summary">Desactivar para reducir el calor producido por el dispositivo durante la carga o para prolongar la vida útil de la batería.</string>
+    <string name="ambient_display_screen_off_udfps_title" product="default">Pulsación larga en el lector de huellas para desbloquear el teléfono</string>
+    <string name="ambient_display_screen_off_udfps_title" product="tablet">Pulsación larga en el lector de huellas para desbloquear la tableta</string>
+    <string name="ambient_display_screen_off_udfps_title" product="device">Pulsación larga en el lector de huellas para desbloquear el dispositivo</string>
+    <string name="ambient_display_screen_off_udfps_summary">Para activar la pantalla y desbloquearla, mantén pulsado el lector de huellas situado en la pantalla.</string>
+    <string name="storage_warning_internal">Advertencia: esta opción puede no funcionar correctamente o provocar la pérdida de datos, por lo que no se recomienda.</string>
+    <string name="assisted_gps_summary">Descargar datos de asistencia por satélite desde Internet puede mejorar considerablemente el rendimiento de inicio del GPS. Para llamadas de emergencia, el GPS asistido siempre está permitido.</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 2c3945f1a39efe647c09418a1f9d15802cd128dd..b803d6a0605336a2f12b8e4ddbd87bd4c37fcb36 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -79,6 +79,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
     <string name="app_notification_sound_timeout_value_30_seconds">30 secondes</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutes</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
     <string name="auto_brightness_one_shot_title">Luminosité automatique rapide</string>
     <string name="auto_brightness_one_shot_summary">La luminosité ne s\'ajustera qu\'au moment où l\'écran s\'allume</string>
diff --git a/res/values-fur-rIT/cm_strings.xml b/res/values-fur-rIT/cm_strings.xml
index 4cc8edfe59523ebf2d5b5c9c8c3ffdb01b9b944f..588b74ed80ce013dc773cf5c0cb25aaedbc0c01d 100644
--- a/res/values-fur-rIT/cm_strings.xml
+++ b/res/values-fur-rIT/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 seconts</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minût</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minûts</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minûts</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minûts</string>
     <string name="auto_brightness_one_shot_title">Luminositât automatiche intun colp</string>
     <string name="auto_brightness_one_shot_summary">La regolazion de luminositât e capitarà dome cuant che il schermi al ven ativât</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 1cfe7cb6b139f999a88d3437dfd556f30be98e56..240d0adea2125b188cbf096ee15ebbbf61019141 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 másodperc</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 perc</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 perc</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 perc</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 perc</string>
     <string name="auto_brightness_one_shot_title">Egylövéses automata-fényerő</string>
     <string name="auto_brightness_one_shot_summary">A fényerőbeállítás csak a képernyő bekapcsolásának pillanatában történik</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 2d8fc7d6cb3315c638bfd3aee915c3e52831fa10..b8611ef68a88d96c5eb371dc795805512705d1e9 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 secondi</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minuti</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minuti</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minuti</string>
     <string name="auto_brightness_one_shot_title">Luminosità automatica singola </string>
     <string name="auto_brightness_one_shot_summary">La regolazione della luminosità avverrà solo quando lo schermo viene acceso</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 5a31d648e2a07d109f636f2ea1327a7e29e42063..6e6474c5aa5f4f3fc37256ced7e665c9dfd617ad 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -77,6 +77,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30秒</string>
     <string name="app_notification_sound_timeout_value_1_minute">1分</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5分</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15分</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30分</string>
     <string name="auto_brightness_one_shot_title">画面点灯時にのみ適用する</string>
     <string name="auto_brightness_one_shot_summary">画面が点灯した時に一度だけ自動で画面の明るさ調整を行います</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 3148893889f0bfcc607a31f46cac4f3d62892617..bcefc559f0a21cb556d332f37127134d2d93338f 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -77,6 +77,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30초</string>
     <string name="app_notification_sound_timeout_value_1_minute">1분</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5분</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15분</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30분</string>
     <string name="auto_brightness_one_shot_title">화면이 켜질 때 한 번만 밝기 조절</string>
     <string name="auto_brightness_one_shot_summary">자동 밝기 조절을 화면이 켜질 때 단 한 번만 실행합니다.</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 037b3e7e7d5f74877d6283ac9c86866d1ee16c8b..061c3f9c046393bb8a00e8403407b3a18e269d70 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 seconden</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minuut</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minuten</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minuten</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minuten</string>
     <string name="auto_brightness_one_shot_title">Eén schot automatische helderheid</string>
     <string name="auto_brightness_one_shot_summary">Helderheid aanpassing zal alleen plaatsvinden op het moment dat het scherm is ingeschakeld</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index f2bd443bda581fff193e8d4f47f4a2fd6df68b65..5697be0b45e5aafc824e8f3c1204792e0d5927a0 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -26,10 +26,10 @@
     <string name="lineagelicense_title">Informacje prawne LineageOS</string>
     <string name="device_info_protected_single_press">Dotknij, aby wyświetlić informacje</string>
     <plurals name="show_dev_countdown_cm">
-        <item quantity="one">Jesteś o <xliff:g id="step_count">%1$d</xliff:g> krok od włączenia ustawień programisty.</item>
-        <item quantity="few">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroki od włączenia ustawień programisty.</item>
-        <item quantity="many">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroków od włączenia ustawień programisty.</item>
-        <item quantity="other">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroków od włączenia ustawień programisty.</item>
+        <item quantity="one">Jesteś o <xliff:g id="step_count">%1$d</xliff:g> krok od włączenia ustawień programistycznych.</item>
+        <item quantity="few">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroki od włączenia ustawień programistycznych.</item>
+        <item quantity="many">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroków od włączenia ustawień programistycznych.</item>
+        <item quantity="other">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroków od włączenia ustawień programistycznych.</item>
     </plurals>
     <string name="show_dev_on_cm">Aktywowano opcje programistyczne!</string>
     <string name="show_dev_already_cm">Opcje programistyczne już zostały aktywowane.</string>
@@ -80,6 +80,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 sekund</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 min</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 min</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minut</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minut</string>
     <string name="auto_brightness_one_shot_title">Jednorazowa jasność automatyczna</string>
     <string name="auto_brightness_one_shot_summary">Regulacja jasności nastąpi tylko w momencie włączenia ekranu</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 5a39624386123b2fe77dd637dd446b207b0c63f9..754f73f3b655c6d7c9cba488fe760510efa0973a 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -78,6 +78,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minutos</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
     <string name="auto_brightness_one_shot_title">Brilho automático de captura única</string>
     <string name="auto_brightness_one_shot_summary">O ajuste de brilho ocorrerá somente no momento em que a tela for ligada</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index c09c4b81215f95c283bb46d23c2adde2b2b42be0..b34c172e896731dab74d3cb74e9fa201657bd7c5 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -79,6 +79,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 de secunde</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 minut</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 minute</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minute</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 de minute</string>
     <string name="auto_brightness_one_shot_title">Luminozitate automată instantă</string>
     <string name="auto_brightness_one_shot_summary">Ajustarea luminozității va avea loc doar în momentul în care ecranul este pornit</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 2502a5841010f61d677b0f8e5c50df851ea96ee8..e186431a97f9358f4fbd56a1d5603eb7d320c49f 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -80,6 +80,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 s</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 min.</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 min.</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 minut</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 min.</string>
     <string name="auto_brightness_one_shot_title">Enkratna samodejna svetlost</string>
     <string name="auto_brightness_one_shot_summary">Prilagoditev svetlosti se bo zgodila samo v trenutku, ko se zaslon vklopi</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 634c2df46d5da981007e180100c0948237c76b45..5eba4e9532affbf9664be7f9948eaa1f1dba9c5e 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -77,6 +77,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 giây</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 phút</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 phút</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 phút</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 phút</string>
     <string name="auto_brightness_one_shot_title">Tự động điều chỉnh độ sáng một lần duy nhất</string>
     <string name="auto_brightness_one_shot_summary">Điều chỉnh độ sáng sẽ chỉ thực hiện một lần duy nhất khi màn hình được bật</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 8fc0c2dd6c8702329af5a62b487551fcd37375e5..b8cafec828f9f964752b5621780cd69641e2894f 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -77,6 +77,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 秒</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 分钟</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 分钟</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 分钟</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 分钟</string>
     <string name="auto_brightness_one_shot_title">一键自动调整亮度</string>
     <string name="auto_brightness_one_shot_summary">亮度调整只会在打开屏幕的那一刻发生</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index cf5479bb0b2d6b6c75c5d2d8871c9ba94fff0c33..04bd12c66f34adbeeb610d809304cf5c559a6311 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -77,6 +77,7 @@
     <string name="app_notification_sound_timeout_value_30_seconds">30 秒</string>
     <string name="app_notification_sound_timeout_value_1_minute">1 分鐘</string>
     <string name="app_notification_sound_timeout_value_5_minutes">5 分鐘</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">15 分鐘</string>
     <string name="app_notification_sound_timeout_value_30_minutes">30 分鐘</string>
     <string name="auto_brightness_one_shot_title">使用自動調整亮度一次</string>
     <string name="auto_brightness_one_shot_summary">將在開啟螢幕時自動調整螢幕亮度一次</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d270da194a4edd7119fa4039242161795267e5d9..fe181701bcf67cc34b21505c51595a591362d49f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -148,6 +148,7 @@
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
         <item name="android:textColorHint">?android:attr/textColorSecondary</item>
         <item name="android:minHeight">@dimen/min_tap_target_size</item>
+        <item name="android:maxLength">500</item>
     </style>
 
     <style name="wifi_section">
diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index f1b5be109d27eac9b321fa19fd803490f30125d1..16519af673074789186c9dc793d11dc14f030d20 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -33,6 +33,10 @@ import android.os.UserHandle;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArraySet;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceClickListener;
 import androidx.preference.PreferenceFragmentCompat;
@@ -46,6 +50,8 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 import com.android.settingslib.core.instrumentation.Instrumentable;
 
+import java.util.Set;
+
 /**
  * Class to load the preference screen to be added to the settings page for the specific account
  * type as specified in the account-authenticator.
@@ -83,6 +89,7 @@ public class AccountTypePreferenceLoader {
             try {
                 desc = mAuthenticatorHelper.getAccountTypeDescription(accountType);
                 if (desc != null && desc.accountPreferencesId != 0) {
+                    Set<String> fragmentAllowList = generateFragmentAllowlist(parent);
                     // Load the context of the target package, then apply the
                     // base Settings theme (no references to local resources)
                     // and create a context theme wrapper so that we get the
@@ -98,6 +105,12 @@ public class AccountTypePreferenceLoader {
                     themedCtx.getTheme().setTo(baseTheme);
                     prefs = mFragment.getPreferenceManager().inflateFromResource(themedCtx,
                             desc.accountPreferencesId, parent);
+                    // Ignore Fragments provided dynamically, as these are coming from external
+                    // applications which must not have access to internal Settings' fragments.
+                    // These preferences are rendered into Settings, so they also won't have access
+                    // to their own Fragments, meaning there is no acceptable usage of
+                    // android:fragment here.
+                    filterBlockedFragments(prefs, fragmentAllowList);
                 }
             } catch (PackageManager.NameNotFoundException e) {
                 Log.w(TAG, "Couldn't load preferences.xml file from " + desc.packageName);
@@ -185,6 +198,48 @@ public class AccountTypePreferenceLoader {
         }
     }
 
+    // Build allowlist from existing Fragments in PreferenceGroup
+    @VisibleForTesting
+    Set<String> generateFragmentAllowlist(@Nullable PreferenceGroup prefs) {
+        Set<String> fragmentAllowList = new ArraySet<>();
+        if (prefs == null) {
+            return fragmentAllowList;
+        }
+
+        for (int i = 0; i < prefs.getPreferenceCount(); i++) {
+            Preference pref = prefs.getPreference(i);
+            if (pref instanceof PreferenceGroup) {
+                fragmentAllowList.addAll(generateFragmentAllowlist((PreferenceGroup) pref));
+            }
+
+            String fragmentName = pref.getFragment();
+            if (!TextUtils.isEmpty(fragmentName)) {
+                fragmentAllowList.add(fragmentName);
+            }
+        }
+        return fragmentAllowList;
+    }
+
+    // Block clicks on any Preference with android:fragment that is not contained in the allowlist
+    @VisibleForTesting
+    void filterBlockedFragments(@Nullable PreferenceGroup prefs,
+            @NonNull Set<String> allowedFragments) {
+        if (prefs == null) {
+            return;
+        }
+        for (int i = 0; i < prefs.getPreferenceCount(); i++) {
+            Preference pref = prefs.getPreference(i);
+            if (pref instanceof PreferenceGroup) {
+                filterBlockedFragments((PreferenceGroup) pref, allowedFragments);
+            }
+
+            String fragmentName = pref.getFragment();
+            if (fragmentName != null && !allowedFragments.contains(fragmentName)) {
+                pref.setOnPreferenceClickListener(preference -> true);
+            }
+        }
+    }
+
     /**
      * Determines if the supplied Intent is safe. A safe intent is one that is
      * will launch a exported=true activity or owned by the same uid as the
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 60252fa8b951a7ae0e442e63eb9c94f7f3ff33ec..98c743a6c75920c82b17f830bfa374e408df7f8d 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -175,6 +175,16 @@ public class SettingsHomepageActivity extends FragmentActivity implements
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Ensure device is provisioned in order to access Settings home
+        // TODO(b/331254029): This should later be replaced in favor of an allowlist
+        boolean unprovisioned = android.provider.Settings.Global.getInt(getContentResolver(),
+                android.provider.Settings.Global.DEVICE_PROVISIONED, 0) == 0;
+        if (unprovisioned) {
+            Log.e(TAG, "Device is not provisioned, exiting Settings");
+            finish();
+            return;
+        }
+
         mIsEmbeddingActivityEnabled = ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this);
         if (mIsEmbeddingActivityEnabled) {
             final UserManager um = getSystemService(UserManager.class);
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index b14a4d7fbf5ecff316a5f580fbc34c7056ae0be6..2fbaafd1911ba928b5f32762844478d6f3616420 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -56,7 +56,7 @@ public interface SearchFeatureProvider {
      * @throws IllegalArgumentException when caller is null
      * @throws SecurityException        when caller is not allowed to launch search result page
      */
-    void verifyLaunchSearchResultPageCaller(Context context, @NonNull ComponentName caller)
+    void verifyLaunchSearchResultPageCaller(@NonNull Context context, @NonNull String callerPackage)
             throws SecurityException, IllegalArgumentException;
 
     /**
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 6f909709058778c73bd92bdd1f986aa85f19aa63..3a62ddfb67e3bede4005fe2ecc9805515899d73c 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -17,13 +17,14 @@
 
 package com.android.settings.search;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
 import com.android.settingslib.search.SearchIndexableResources;
 import com.android.settingslib.search.SearchIndexableResourcesMobile;
 
@@ -32,21 +33,18 @@ import com.android.settingslib.search.SearchIndexableResourcesMobile;
  */
 public class SearchFeatureProviderImpl implements SearchFeatureProvider {
 
-    private static final String TAG = "SearchFeatureProvider";
-
     private SearchIndexableResources mSearchIndexableResources;
 
     @Override
-    public void verifyLaunchSearchResultPageCaller(Context context, ComponentName caller) {
-        if (caller == null) {
+    public void verifyLaunchSearchResultPageCaller(@NonNull Context context,
+            @NonNull String callerPackage) {
+        if (TextUtils.isEmpty(callerPackage)) {
             throw new IllegalArgumentException("ExternalSettingsTrampoline intents "
                     + "must be called with startActivityForResult");
         }
-        final String packageName = caller.getPackageName();
-        final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
-                || TextUtils.equals(getSettingsIntelligencePkgName(context), packageName);
-        final boolean isAllowlistedPackage =
-                isSignatureAllowlisted(context, caller.getPackageName());
+        final boolean isSettingsPackage = TextUtils.equals(callerPackage, context.getPackageName())
+                || TextUtils.equals(getSettingsIntelligencePkgName(context), callerPackage);
+        final boolean isAllowlistedPackage = isSignatureAllowlisted(context, callerPackage);
         if (isSettingsPackage || isAllowlistedPackage) {
             return;
         }
diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java
index 5e710293c2c47c95ed26f66a4b7304169d67e017..2c6fd67a2f2e426b0a2ac29f6eafeb7f75c1dd82 100644
--- a/src/com/android/settings/search/SearchResultTrampoline.java
+++ b/src/com/android/settings/search/SearchResultTrampoline.java
@@ -20,7 +20,6 @@ import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENT
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB;
 
 import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -51,11 +50,11 @@ public class SearchResultTrampoline extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        final ComponentName callingActivity = getCallingActivity();
+        final String callerPackage = getLaunchedFromPackage();
         // First make sure caller has privilege to launch a search result page.
         FeatureFactory.getFactory(this)
                 .getSearchFeatureProvider()
-                .verifyLaunchSearchResultPageCaller(this, callingActivity);
+                .verifyLaunchSearchResultPageCaller(this, callerPackage);
         // Didn't crash, proceed and launch the result as a subsetting.
         Intent intent = getIntent();
         final String highlightMenuKey = intent.getStringExtra(
@@ -99,7 +98,7 @@ public class SearchResultTrampoline extends Activity {
 
         if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) {
             startActivity(intent);
-        } else if (isSettingsIntelligence(callingActivity)) {
+        } else if (isSettingsIntelligence(callerPackage)) {
             if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SETTINGS_SEARCH_ALWAYS_EXPAND)) {
                 startActivity(SettingsActivity.getTrampolineIntent(intent, highlightMenuKey)
                         .setClass(this, DeepLinkHomepageActivityInternal.class)
@@ -132,9 +131,9 @@ public class SearchResultTrampoline extends Activity {
         finish();
     }
 
-    private boolean isSettingsIntelligence(ComponentName callingActivity) {
-        return callingActivity != null && TextUtils.equals(
-                callingActivity.getPackageName(),
+    private boolean isSettingsIntelligence(String callerPackage) {
+        return TextUtils.equals(
+                callerPackage,
                 FeatureFactory.getFactory(this).getSearchFeatureProvider()
                         .getSettingsIntelligencePkgName(this));
     }
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index f3496001d09649d1feba8e18eac7270abe7238ba..8a7419bb1ba9046876e66984f22139103306a99c 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -20,7 +20,6 @@ package com.android.settings.search;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ResolveInfo;
@@ -131,20 +130,22 @@ public class SearchFeatureProviderImplTest {
 
     @Test(expected = SecurityException.class)
     public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {
-        final ComponentName cn = new ComponentName("pkg", "class");
-        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
+        final String packageName = "pkg";
+
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);
     }
 
     @Test
     public void verifyLaunchSearchResultPageCaller_settingsCaller_shouldNotCrash() {
-        final ComponentName cn = new ComponentName(mActivity.getPackageName(), "class");
-        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
+        final String packageName = mActivity.getPackageName();
+
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);
     }
 
     @Test
     public void verifyLaunchSearchResultPageCaller_settingsIntelligenceCaller_shouldNotCrash() {
         final String packageName = mProvider.getSettingsIntelligencePkgName(mActivity);
-        final ComponentName cn = new ComponentName(packageName, "class");
-        mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
+
+        mProvider.verifyLaunchSearchResultPageCaller(mActivity, packageName);
     }
 }