Merge branch 'lineage-21' of https://github.com/LineageOS/android_hardware_samsung into urubino

# Conflicts:
#	doze/Android.mk

Change-Id: Ied7efdbf65e3da8f4471ae7cc782351d244a8aa2
Signed-off-by: Jenna-they-them <jenna@jenslody.de>

AdvancedDisplay/res/values-pt-rBR/strings.xml

@@ -20,7 +20,7 @@
     <string name="category_screen_title">Tela</string>
     <string name="screen_colors_title">Cores</string>
     <string name="mdnie_scenario_title_head">Cenário</string>
-    <string name="mdnie_scenario_summary_head">Defina o cenário mDNIe</string>
+    <string name="mdnie_scenario_summary_head">Define o cenário mDNIe</string>
     <string name="mdnie_accessibility_title_head">Modo de acessibilidade</string>
     <string name="mdnie_accessibility_summary_head">Definir o modo de acessibilidade do mDNIe</string>
     <string name="mdnie_scenario_ui">LineageOS (padrão)</string>

AdvancedDisplay/res/values-sc-rIT/strings.xml

@@ -18,5 +18,4 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="category_screen_title">Ischermu</string>
     <string name="screen_colors_title">Colores</string>
-    <string name="mdnie_scenario_video_warm">Tonu vìdeu callente</string>
 </resources>

dap/res/values-is/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dolby_enable_title">Virkja Dolby Atmos</string>
-    <string name="dolby_top_intro_summary">Upplifðu framúrskarandi hljómgæði fyrir afspilun margmiðlunar sem flæðir fyrir ofan þig og í kring</string>
+    <string name="dolby_top_intro_summary">Upplifðu framúrskarandi hljómgæða fyrir afspilun margmiðlunar sem flæðir fyrir ofan þig og í kring</string>
     <string name="dolby_profile_auto">Sjálfvirkt</string>
     <string name="dolby_profile_game">Leikur</string>
     <string name="dolby_profile_game_1">Leikur 1</string>

dap/res/values-pt-rBR/strings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="dolby_enable_title">Habilitar Dolby Atmos</string>
-    <string name="dolby_top_intro_summary">Experimente uma mudança dramática no áudio para reprodução de mídia que flui acima e ao seu redor</string>
-    <string name="dolby_profile_auto">Automático</string>
-    <string name="dolby_profile_game">Jogo</string>
-    <string name="dolby_profile_game_1">Jogo 1</string>
-    <string name="dolby_profile_game_2">Jogo 2</string>
-    <string name="dolby_profile_movie">Filme</string>
-    <string name="dolby_profile_music">Música</string>
-    <string name="dolby_profile_off">Nenhum perfil</string>
-    <string name="dolby_profile_spacial_audio">Áudio espacial</string>
-    <string name="dolby_profile_voice">Voz</string>
-</resources>