diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2f910e4..17f8303 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3313,10 +3313,15 @@
         </provider>
 
         <receiver
-            android:name=".slices.SliceBroadcastReceiver" >
-            <intent-filter>
-                <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/>
-            </intent-filter>
+            android:name=".slices.SliceBroadcastReceiver"
+            android:exported="false">
+        </receiver>
+
+        <receiver
+            android:name=".slices.SliceRelayReceiver"
+            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"
+            android:exported="true">
+
         </receiver>
 
         <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 7ce4da7..b155634 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2,6 +2,18 @@
 <issues format="4">
 
     <issue
+        id="LintError"
+        severity="Error"
+        message="No `.class` files were found in project &quot;.&quot;, so none of the classfile based checks could be run. Does the project need to be built first?"
+        category="Lint"
+        priority="10"
+        summary="Lint Failure"
+        explanation="This issue type represents a problem running lint itself. Examples include failure to find bytecode for source files (which means certain detectors could not be run), parsing errors in lint configuration files, etc.&#xA;These errors are not errors in your own code, but they are shown to make it clear that some checks were not completed.">
+        <location
+            file="."/>
+    </issue>
+
+    <issue
         id="HardCodedColor"
         severity="Error"
         message="Avoid using hardcoded color"
@@ -2141,7 +2153,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="116"
+            line="110"
             column="13"/>
     </issue>
 
@@ -2157,7 +2169,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="135"
+            line="129"
             column="13"/>
     </issue>
 
@@ -2173,7 +2185,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="165"
+            line="175"
             column="13"/>
     </issue>
 
@@ -2189,7 +2201,55 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/layout/radio_info.xml"
-            line="303"
+            line="205"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="232"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="256"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:background=&quot;#000000&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/layout/radio_info.xml"
+            line="293"
             column="13"/>
     </issue>
 
@@ -2429,7 +2489,7 @@
         errorLine2="                                                                                                                                                                       ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rXC/strings.xml"
-            line="2531"
+            line="2422"
             column="168"/>
     </issue>
 
@@ -2444,8 +2504,8 @@
         errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="res/values-en-rAU/strings.xml"
-            line="2532"
+            file="res/values-en-rCA/strings.xml"
+            line="2423"
             column="64"/>
     </issue>
 
@@ -2460,8 +2520,8 @@
         errorLine1="    &lt;string name=&quot;sync_plug&quot; msgid=&quot;3905078969081888738&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
-            file="res/values-en-rCA/strings.xml"
-            line="2532"
+            file="res/values-en-rAU/strings.xml"
+            line="2541"
             column="64"/>
     </issue>
 
@@ -2477,7 +2537,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2532"
+            line="2541"
             column="64"/>
     </issue>
 
@@ -2493,7 +2553,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2532"
+            line="2541"
             column="64"/>
     </issue>
 
@@ -2509,7 +2569,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="5920"
+            line="5925"
             column="36"/>
     </issue>
 
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d048b53..7224c9a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkbesonderhede"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel of \'n Wi-Fi-warmkol opstel."</string>
     <string name="devices_title" msgid="7701726109334110391">"Toestelle"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Verstek"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fc0bcd4..16a1615 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"የአውታረ መረብ ዝርዝሮች"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"የእርስዎ መሣሪያ በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች የሚታይ ነው። ወድ ብሉቱዝ መሣሪያዎች ሲያገኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በተጨማሪ በሌሎች ሰዎች የሚታይ ይሆናል።"</string>
     <string name="devices_title" msgid="7701726109334110391">"መሣሪያዎች"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ነባሪ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0df7706..7f72b60 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -4426,4 +4426,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"تفاصيل الشبكة"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"‏اسم جهازك مرئي للتطبيقات على هاتفك. ويمكن أيضًا أن يراه أشخاص آخرون عند الاتصال بأجهزة بلوتوث أو إعداد نقطة اتصال Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"الأجهزة"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"تلقائي"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index be879cc..700751e 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Şəbəkə məlumatları"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Cihazın adı telefondakı tətbiqlərdə görünəcək. Bluetooth cihazlarına qoşulduqda və ya Wi-Fi hotspotu ayarladıqda digərləri də onu görə bilər."</string>
     <string name="devices_title" msgid="7701726109334110391">"Cihazlar"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Defolt"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 640181d..1134530 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -4219,4 +4219,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalji o mreži"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Podrazumevana"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f65425a..b1bcd93 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -4290,4 +4290,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Інфармацыя аб сетцы"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Назва вашай прылады даступная для праграм на вашым тэлефоне. Яе таксама будуць бачыць іншыя людзі, калі вы падключыцеся да прылад праз Bluetooth ці наладзіце хот-спот Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Прылады"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандартная"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0ef0ae7..e4e2ea8 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Подробности за мрежата"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Името на устройството ви е видимо за приложенията на телефона ви. То може да се вижда и от други хора, когато се свържете с устройства с Bluetooth или настроите точка за достъп до Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Устройства"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандартно"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c1a26e0..9701f0c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"নেটওয়ার্কের বিবরণ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"আপনার ডিভাইসের নাম আপনার ফোনে থাকা অ্যাপে দেখা যাবে। আপনি যখন এটিকে ব্লুটুথ ডিভাইসের সাথে কানেক্ট করেন বা ওয়াই-ফাই হটস্পট সেট-আপ করেন তখন এটি অন্যরাও দেখতে পেতে পারেন।"</string>
     <string name="devices_title" msgid="7701726109334110391">"ডিভাইস"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ডিফল্ট"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 9cb6070..65665d0 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -4219,4 +4219,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalji o mreži"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Naziv uređaja mogu vidjeti aplikacije na telefonu. Mogu ga vidjeti i druge osobe kada se povežete na Bluetooth uređaje ili postavite WiFi pristupnu tačku."</string>
     <string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Zadano"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4832e07..f415e56 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalls de la xarxa"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"El nom del dispositiu és visible per a les aplicacions del telèfon. També el poden veure altres persones si el connectes a un dispositiu Bluetooth o si configures un punt d\'accés Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositius"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminat"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8cafe56..e976e75 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Podrobnosti sítě"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Název vašeho zařízení je viditelný pro aplikace v telefonu. Mohou ho vidět také ostatní uživatelé, když se připojíte k zařízení Bluetooth nebo hotspotu Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Zařízení"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Výchozí"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index daee94f..d6e5a1c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Netværksoplysninger"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Navnet på din enhed er synligt for apps på din telefon. Det kan muligvis også ses af andre, når du opretter forbindelse til Bluetooth-enheder eller konfigurerer et Wi-Fi-hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Enheder"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standard"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bcc4a55..ccb80ef 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Netzwerkdetails"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Dein Gerätename ist für Apps auf deinem Smartphone sichtbar. Wenn du dich mit Bluetooth-Geräten verbindest oder einen WLAN-Hotspot einrichtest, kann er möglicherweise auch von anderen Personen gesehen werden."</string>
     <string name="devices_title" msgid="7701726109334110391">"Geräte"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standard"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index eef1bf5..646e7fe 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Λεπτομέρειες δικτύου"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Το όνομα της συσκευής σας είναι ορατό σε εφαρμογές στο τηλέφωνό σας. Ενδέχεται επίσης να είναι ορατό και σε άλλα άτομα, όταν συνδέεστε σε συσκευές Bluetooth ή ρυθμίζετε ένα σημείο πρόσβασης Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Συσκευές"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Προεπιλογή"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6010334..0ae6736 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6010334..0ae6736 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6010334..0ae6736 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7bdc491..a29c0f0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -4148,4 +4148,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalles de la red"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"El nombre de tu dispositivo es visible para las apps del teléfono. Es posible que también lo vean otras personas cuando te conectes a dispositivos Bluetooth o configures un hotspot de Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminado"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ed3e7e3..c9bff55 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalles de la red"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Las aplicaciones de tu teléfono pueden ver el nombre de tu dispositivo. También es posible que lo vean otros usuarios si lo conectas con dispositivos Bluetooth o configuras un punto de acceso Wi‑Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminado"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c44c5d3..b27ee65 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Võrgu üksikasjad"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Teie seadme nimi on telefonis rakendustele nähtav. Bluetoothi seadmetega ühendamisel või WiFi-pääsupunkti loomisel võivad seda näha ka teised inimesed."</string>
     <string name="devices_title" msgid="7701726109334110391">"Seadmed"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Vaikeseade"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index faef378..5d3a517 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Sarearen xehetasunak"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth gailuetara konektatzean edo Wi-Fi sare publiko bat konfiguratzean."</string>
     <string name="devices_title" msgid="7701726109334110391">"Gailuak"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Lehenetsia"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c2c9b62..cf034f6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"جزئیات شبکه"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"‏نام دستگاه شما برای برنامه‌های موجود در تلفنتان قابل‌مشاهده است. ممکن است وقتی به دستگاه‌های بلوتوث متصل می‌شوید یا نقطه اتصال Wi-Fi راه‌اندازی می‌کنید، برای سایر افراد نیز قابل‌مشاهده باشد."</string>
     <string name="devices_title" msgid="7701726109334110391">"دستگاه‌ها"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"پیش‌فرض"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d9dadca..d375277 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Verkon tiedot"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Puhelimen sovellukset näkevät laitteesi nimen. Muut voivat myös nähdä nimen, kun muodostat Bluetooth-yhteyden laitteisiin tai aktivoit Wi-Fi-hotspotin."</string>
     <string name="devices_title" msgid="7701726109334110391">"Laitteet"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Oletus"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4fe5de5..0556966 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Détails du réseau"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Le nom de votre appareil est visible pour les applications de votre téléphone. Il est aussi possible que d\'autres personnes le voient lorsque vous vous connectez à des appareils Bluetooth ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Appareils"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Par défaut"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 45a90f0..cf412d8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Détails du réseau"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Le nom de votre appareil est visible par les applications installées sur votre téléphone. Il peut l\'être également par d\'autres personnes en cas de connexion à des appareils Bluetooth ou de configuration d\'un point d\'accès Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Appareils"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Par défaut"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 09f390a..3133fdc 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -4151,4 +4151,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalles da rede"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"As aplicacións do teu teléfono poden consultar o nome do teu dispositivo. Tamén poden velo outros usuarios cando te conectes a dispositivos Bluetooth ou configures zonas wifi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminado"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index adcf0d2..07193e6 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"નેટવર્કની વિગતો"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"તમારા ઉપકરણનું નામ તમારા ફોનની ઍપ પર જોઈ શકાય છે. તમે બ્લૂટૂથથી કનેક્ટ કરો અથવા વાઇ-ફાઇ હૉટસ્પૉટને સેટ કરો ત્યારે તે અન્ય લોકોને પણ દેખાઈ શકે છે."</string>
     <string name="devices_title" msgid="7701726109334110391">"ઉપકરણો"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ડિફૉલ્ટ"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ffc70ad..47c712a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्क के बारे में जानकारी"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"आपके फ़ोन पर मौजूद ऐप्लिकेशन, आपके डिवाइस का नाम जान सकते हैं. ब्लूटूथ डिवाइस जोड़ते समय या वाई-फ़ाई हॉटस्पॉट सेटअप करते समय, इसे दूसरे लोग भी देख सकते हैं."</string>
     <string name="devices_title" msgid="7701726109334110391">"डिवाइस"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"डिफ़ॉल्ट"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e5574b5..0221327 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -4219,4 +4219,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Pojedinosti o mreži"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Naziv vašeg uređaja vidljiv je aplikacijama na vašem telefonu. Mogu ga vidjeti i drugi ljudi kada se povežete s Bluetooth uređajima ili postavite Wi-Fi žarišnu točku."</string>
     <string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Zadano"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c901305..a0739d9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Hálózati információk"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Eszköze neve látható a telefonján lévő alkalmazások számára. Mások is láthatják, ha csatlakoztatja telefonját más Bluetooth-eszközökhöz, vagy ha Wi-Fi-hotspotot állít be."</string>
     <string name="devices_title" msgid="7701726109334110391">"Eszközök"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Alapértelmezett"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 62f234d..745e3af 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Ցանցի տվյալներ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Ձեր սարքի անունը տեսանելի է հեռախոսի հավելվածներին։ Այն կարող են տեսնել օգտատերերը, երբ միանում եք Bluetooth սարքերի կամ կարգավորում եք Wi-Fi թեժ կետը։"</string>
     <string name="devices_title" msgid="7701726109334110391">"Սարքեր"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Կանխադրված"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d57678c..970c868 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detail jaringan"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nama perangkat terlihat oleh aplikasi di ponsel, dan juga mungkin dilihat oleh orang lain saat Anda menghubungkan ke perangkat Bluetooth atau menyiapkan hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Perangkat"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 2166b5c..19496d5 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Upplýsingar um net"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Heiti tækisins þíns er sýnilegt forritum í símanum. Heiti þess er hugsanlega einnig sýnilegt öðru fólki þegar þú tengist Bluetooth-tækjum eða setur upp heitan Wi-Fi reit."</string>
     <string name="devices_title" msgid="7701726109334110391">"Tæki"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Sjálfgefið"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7e540c5..ae1425f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Dettagli rete"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Il nome del tuo dispositivo è visibile alle app installate sul telefono. Potrebbe essere visibile anche ad altre persone se ti connetti a dispositivi Bluetooth o configuri un hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivi"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Valore predefinito"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9351adf..80fa050 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -4290,4 +4290,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"פרטי הרשת"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"‏שם המכשיר שלך גלוי לאפליקציות בטלפון שלך. כמו כן, ייתכן שאנשים אחרים יראו אותו בהתחברות למכשירי Bluetooth או כשמגדירים נקודת Wi-Fi לשיתוף אינטרנט."</string>
     <string name="devices_title" msgid="7701726109334110391">"מכשירים"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ברירת מחדל"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 267879d..55c26b3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -4154,4 +4154,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ネットワークの詳細"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"端末名がスマートフォンのアプリに表示されます。また、Bluetooth デバイスに接続したり Wi-Fi アクセス ポイントを設定したりすると、他のユーザーも端末名を確認できるようになります。"</string>
     <string name="devices_title" msgid="7701726109334110391">"端末"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"デフォルト"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index aaa0fba..3b9bb14 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ქსელის დეტალები"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"თქვენი მოწყობილობის სახელი ხილულია თქვენს ტელეფონზე არსებული აპებისთვის. მისი დანახვას ასევე შეძლებენ სხვა პირები, როცა Bluetooth მოწყობილობებს დაუკავშირდებით ან Wi-Fi უსადენო ქსელით ისარგებლებთ."</string>
     <string name="devices_title" msgid="7701726109334110391">"მოწყობილობები"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ნაგულისხმევი"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 6670c0b..3ce5f47 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Желі деректері"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Құрылғыңыздың аты телефоныңыздағы қолданбаларға көрінеді. Сонымен қатар Bluetooth құрылғыларына қосылғанда немесе Wi-Fi хотспотын орнатқанда, басқа адамдарға көрінуі мүмкін."</string>
     <string name="devices_title" msgid="7701726109334110391">"Құрылғылар"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Әдепкі"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 0deb07f..4c508b1 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ព័ត៌មាន​លម្អិតនៃ​បណ្ដាញ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"ឈ្មោះ​ឧបករណ៍​របស់អ្នក​អាច​ឱ្យ​កម្មវិធី​នៅលើ​ទូរសព្ទ​របស់អ្នក​មើលឃើញ។ វា​ក៏​អាច​ឱ្យ​អ្នក​ដទៃ​មើល​ឃើញ​ផងដែរ នៅពេល​ដែលអ្នក​ភ្ជាប់​ទៅ​ឧបករណ៍​ប៊្លូធូស ឬ​រៀបចំ​ហតស្ប៉ត Wi-Fi ។"</string>
     <string name="devices_title" msgid="7701726109334110391">"ឧបករណ៍"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"លំ​នាំ​ដើម"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 29966ff..c4d5219 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ನೆಟ್‌ವರ್ಕ್‌ ವಿವರಗಳು"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"ನಿಮ್ಮ ಸಾಧನದ ಹೆಸರು ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಗೋಚರಿಸುತ್ತದೆ. ನೀವು ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಸಂಪರ್ಕಿಸಿದಾಗ ಅಥವಾ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಹೊಂದಿಸಿದಾಗ ಇತರ ಜನರು ಸಹ ಅದನ್ನು ನೋಡಬಹುದು."</string>
     <string name="devices_title" msgid="7701726109334110391">"ಸಾಧನಗಳು"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ಡಿಫಾಲ್ಟ್"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 44b4b65..8ed7b4c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"네트워크 세부정보"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"휴대전화에 설치된 앱에 기기 이름이 표시됩니다. 기기 이름은 블루투스 기기에 연결하거나 Wi-Fi 핫스팟을 설정할 때 다른 사용자에게 표시될 수도 있습니다."</string>
     <string name="devices_title" msgid="7701726109334110391">"기기"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"기본값"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c913d5c..2a115f3 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -4149,4 +4149,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Тармактын чоо-жайы"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Түзмөгүңүздүн аталышы телефонуңуздагы колдонмолорго көрүнүктүү. Bluetooth түзмөктөрүнө туташканыңызда же Wi‑Fi туташуу түйүнүн жөндөгөнүңүздө, аны башка адамдар да көрүшү мүмкүн."</string>
     <string name="devices_title" msgid="7701726109334110391">"Түзмөктөр"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Демейки"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index d2deea2..55ce988 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ລາຍລະອຽດເຄືອຂ່າຍ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"ຊື່ອຸປະກອນຂອງທ່ານຈະສາມາດເບິ່ງເຫັນໄດ້ໂດຍແອັບຢູ່ໂທລະສັບຂອງທ່ານ. ນອກຈາກນັ້ນ, ຄົນອື່ນອາດຈະເຫັນມັນໄດ້ເມື່ອທ່ານເຊື່ອມຕໍ່ຫາອຸປະກອນ Bluetooth ຫຼື ຕັ້ງ Wi-Fi ຮັອດສະປອດ."</string>
     <string name="devices_title" msgid="7701726109334110391">"ອຸປະກອນ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ຄ່າເລີ່ມຕົ້ນ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 57cfde3..1a6de91 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Išsami tinklo informacija"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Įrenginio pavadinimas matomas jūsų telefone esančioms programoms. Kai prisijungiate prie „Bluetooth“ įrenginių arba nustatote „Wi-Fi“ viešosios interneto prieigos tašką, jį taip pat gali matyti kiti žmonės."</string>
     <string name="devices_title" msgid="7701726109334110391">"Įrenginiai"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Numatytoji"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 841a9ff..ec416c3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -4219,4 +4219,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Dati par tīklu"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Jūsu ierīces nosaukums ir redzams tālrunī instalētajām lietotnēm. Ja izveidosiet savienojumu ar Bluetooth ierīcēm vai iestatīsiet Wi-Fi tīklāju, tas būs redzams arī citām personām."</string>
     <string name="devices_title" msgid="7701726109334110391">"Ierīces"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Noklusējums"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1c75404..f177c63 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Детали за мрежа"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Името на уредот е видливо за апликациите на телефонот. Може да го видат и други луѓе кога ќе се поврзете со уреди со Bluetooth или кога ќе поставите Wi-Fi точка на пристап."</string>
     <string name="devices_title" msgid="7701726109334110391">"Уреди"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандардно"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index dbe40ab..77fc97c 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"നെറ്റ്‌വർക്ക് വിശദാംശങ്ങൾ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"നിങ്ങളുടെ ഫോണിലെ അപ്ലിക്കേഷനുകൾക്ക് നിങ്ങളുടെ ഉപകരണത്തിന്റെ പേര് ദൃശ്യമാണ്. വൈഫൈ ഹോട്ട്‌സ്‌പോട്ട് സജ്ജീകരിക്കുമ്പോഴോ Bluetooth ഉപകരണങ്ങളുമായി കണക്‌റ്റ് ചെയ്യുമ്പോഴോ, ഇത് മറ്റ് ആളുകൾക്കും കാണാനായേക്കും."</string>
     <string name="devices_title" msgid="7701726109334110391">"ഉപകരണങ്ങൾ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ഡിഫോൾട്ട്"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index a9c4676..bf2cd32 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -4148,4 +4148,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Сүлжээний мэдээлэл"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Таны төхөөрөмжийн нэр таны утасны аппуудад харагдана. Та Bluetooth төхөөрөмжүүдэд холбогдох эсвэл Wi-Fi сүлжээний цэгийг тохируулах үед энэ нь бусад хүмүүст харагдаж болзошгүй."</string>
     <string name="devices_title" msgid="7701726109334110391">"Төхөөрөмжүүд"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Өгөгдмөл"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1a2089c..5543343 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -4151,4 +4151,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्क तपशील"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील अॅप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
     <string name="devices_title" msgid="7701726109334110391">"डिव्हाइस"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"डीफॉल्ट"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c981621..3a7e544 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Butiran rangkaian"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nama peranti anda kelihatan kepada apl pada telefon anda. Nama ini mungkin dapat dilihat oleh orang lain juga apabila anda menyambung ke peranti Bluetooth atau menyediakan tempat liputan Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Peranti"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Lalai"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 3841c5a..2103905 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ကွန်ရက် အသေးစိတ်များ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"သင့်စက်ပစ္စည်းအမည်ကို သင့်ဖုန်းပေါ်ရှိ အက်ပ်များက မြင်ရပါသည်။ သင် \'ဘလူးတုသ်\' စက်ပစ္စည်းများသို့ ချိတ်ဆက်သည့်အခါ သို့မဟုတ် Wi-Fi ဟော့စပေါ့ ထုတ်လွှင့်သည့်အခါ အခြားသူများက မြင်နိုင်ပါသည်။"</string>
     <string name="devices_title" msgid="7701726109334110391">"စက်များ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"မူရင်း"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6e61419..7e6ef14 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Nettverksdetaljer"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Enhetsnavnet ditt er synlig for apper på telefonen. Det kan også ses av andre personer når du kobler til Bluetooth-enheter eller konfigurerer en Wi-Fi-sone."</string>
     <string name="devices_title" msgid="7701726109334110391">"Enheter"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standard"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 57a91f1..5d0777d 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्कसम्बन्धी विवरणहरू"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"तपाईंको फोनमा रहेका अनुप्रयोगहरूले तपाईंको यन्त्रको नाम देख्न सक्छन्। तपाईंले ब्लुटुथ यन्त्रहरूमा जडान गर्दा वा कुनै Wi-Fi हटस्पट सेटअप गर्दा अरू मान्छेहरू पनि यसलाई देख्न सक्छन्।"</string>
     <string name="devices_title" msgid="7701726109334110391">"यन्त्रहरू"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"पूर्वनिर्धारित"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5ac37ec..dfa6f56 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkgegevens"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"De naam van je apparaat is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien wanneer je verbinding maakt met Bluetooth-apparaten of een wifi-hotspot instelt."</string>
     <string name="devices_title" msgid="7701726109334110391">"Apparaten"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standaard"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 43f1852..c8ded5c 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ਨੈੱਟਵਰਕ ਵੇਰਵੇ"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਐਪਾਂ ਨੂੰ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ। ਇਹ ਤੁਹਾਡੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਜਾਂ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਸੈੱਟਅੱਪ ਕਰਨ \'ਤੇ ਹੋਰ ਲੋਕਾਂ ਵੱਲੋਂ ਵੀ ਦੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="devices_title" msgid="7701726109334110391">"ਡੀਵਾਈਸਾਂ"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6ad2cf8..365e792 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Szczegóły sieci"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nazwa urządzenia jest widoczna dla aplikacji na telefonie. Mogą ją też zobaczyć inne osoby, gdy łączysz się z urządzeniami przez Bluetooth lub konfigurujesz hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Urządzenia"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Wartość domyślna"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9806ed2..1e33a2f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalhes da rede"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"O nome do seu dispositivo está visível para os apps no seu smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou configura um ponto de acesso Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Padrão"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 803e525..7273c4f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalhes da rede"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"O nome do seu dispositivo é visível para as aplicações do telemóvel. Também pode ser visto por outras pessoas quando se liga a dispositivos Bluetooth ou configura uma zona Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predefinição"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9806ed2..1e33a2f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalhes da rede"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"O nome do seu dispositivo está visível para os apps no seu smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou configura um ponto de acesso Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Padrão"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ba83016..9ce6312 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -4219,4 +4219,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detalii despre rețea"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Numele dispozitivului este vizibil aplicațiilor de pe telefon. Poate fi văzut și de alte persoane când vă conectați la dispozitivele Bluetooth sau configurați un hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Dispozitive"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Prestabilită"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b0ebdec..0a5fa71 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Сведения о сети"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"У приложений на телефоне есть доступ к названию устройства. Его могут видеть другие пользователи, когда вы подключаетесь к устройствам по Bluetooth или настраиваете точку доступа Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Устройства"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"По умолчанию"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9566a3b..d379636 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"ජාල විස්තර"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"ඔබගේ උපාංගයේ නම ඔබගේ දුරකථනයේ යෙදුම්වලට දෘශ්‍යමානය. ඔබ බ්ලූටූත්වලට සම්බන්ධ වූ විට හෝ Wi-Fi හොට්ස්පොට් එකක් පිහිට වූ විට වෙනත් පුද්ගලයන්ද එය දැකිය හැකිය."</string>
     <string name="devices_title" msgid="7701726109334110391">"උපාංග"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"පෙරනිමි"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 69fa877..1fd0cd6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Podrobnosti siete"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Názov zariadenia je viditeľný pre aplikácie v telefóne. Môže sa zobrazovať aj ostatným používateľom po pripojení k zariadeniu Bluetooth alebo nastavení hotspotu Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Zariadenia"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predvolený"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 79d2715..d3f619a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"O omrežju"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Ime naprave je vidno aplikacijam v telefonu. Ko vzpostavite povezavo z napravami Bluetooth ali nastavite dostopno točko Wi-Fi, ga bodo morda videle tudi druge osebe."</string>
     <string name="devices_title" msgid="7701726109334110391">"Naprave"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Privzeto"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a2c5e27..1a484a0 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Detajet e rrjetit"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Emri i pajisjes sate është i dukshëm për aplikacionet në telefonin tënd. Ai mund të shikohet po ashtu nga persona të tjerë kur lidhesh me pajisje me Bluetooth ose kur konfiguron një zonë të qasjes për internet me Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Pajisjet"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"I parazgjedhur"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2878218..3d2a005 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -4219,4 +4219,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Детаљи о мрежи"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите Wi-Fi хотспот."</string>
     <string name="devices_title" msgid="7701726109334110391">"Уређаји"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Подразумевана"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b24a893..65c9a53 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Nätverksinformation"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Enhetens namn är synligt för appar i mobilen. Det kan också vara synligt för andra personer när du ansluter till Bluetooth-enheter eller om du skapar en Wi-Fi-surfzon."</string>
     <string name="devices_title" msgid="7701726109334110391">"Enheter"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standard"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5affe9a..25af2f1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Maelezo ya mtandao"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Jina la kifaa chako litaonekana kwenye programu zilizo katika simu yako. Pia linaweza kuonekana kwa watu wengine wakati unaunganisha vifaa vya Bluetooth au kuweka mtandao hewa wa Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Vifaa"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Chaguomsingi"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index c9a7ccd..ee06c21 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"நெட்வொர்க் விவரங்கள்"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"உங்களது மொபைலில் உள்ள ஆப்ஸிற்கு, உங்கள் சாதனத்தின் பெயர் தெரியும். புளூடூத் சாதனங்களுடன் இணைக்கும்போது அல்லது வைஃபை ஹாட்ஸ்பாட்டை அமைக்கும்போது, அப்பெயர் பிறருக்குக் காட்டப்படலாம்."</string>
     <string name="devices_title" msgid="7701726109334110391">"சாதனங்கள்"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"இயல்பு"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 1b7f9fa..3a34ba8 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -4151,4 +4151,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"నెట్‌వర్క్ వివరాలు"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"మీ ఫోన్‌లోని యాప్‌లకు మీ పరికరం పేరు కనిపిస్తుంది. మీరు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేసినప్పుడు లేదా Wi-Fi హాట్‌స్పాట్‌ని సెటప్ చేసినప్పుడు ఇతర వ్యక్తులకు కూడా ఇది కనిపించవచ్చు."</string>
     <string name="devices_title" msgid="7701726109334110391">"పరికరాలు"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"డిఫాల్ట్"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9847eb7..d1e8e56 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"รายละเอียดเครือข่าย"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"แอปในโทรศัพท์จะเห็นชื่อของอุปกรณ์ และคนอื่นก็อาจเห็นเช่นกันหากคุณเชื่อมต่อกับอุปกรณ์บลูทูธหรือตั้งค่าฮอตสปอต Wi-Fi"</string>
     <string name="devices_title" msgid="7701726109334110391">"อุปกรณ์"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ค่าเริ่มต้น"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 47829ae..699b776 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Mga detalye ng network"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nakikita ang pangalan ng iyong device sa mga app sa iyong telepono. Maaari rin itong makita ng ibang tao kapag kumonekta ka sa mga Bluetooth device o nag-set up ka ng Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Mga Device"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b63e692..c1d5741 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Ağ ayrıntıları"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Telefonunuzdaki uygulamalar cihazınızın adını görür. Bluetooth cihazlarına bağlandığınızda veya bir kablosuz hotspot ayarladığınızda başka kişiler de bu adı görebilir."</string>
     <string name="devices_title" msgid="7701726109334110391">"Cihazlar"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Varsayılan"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b9b88c3..4d2d256 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -4288,4 +4288,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Дані мережі"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Додатки на телефоні бачать назву пристрою. Її також можуть бачити інші люди, коли ви під’єднуєтеся до пристроїв Bluetooth або налаштовуєте точку доступу Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Пристрої"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"За умовчанням"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3751c1f..370c5bb 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -4148,4 +4148,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"نیٹ ورک کی تفصیلات"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"‏آپ کے آلہ کا نام آپ کے فون پر موجود ایپس میں مرئی ہوتا ہے۔ جب آپ بلوٹوتھ آلات سے منسلک ہوتے ہیں یا Wi-Fi ہاٹ اسپاٹ سیٹ اپ کرتے ہیں تو دوسرے لوگ بھی اسے دیکھ سکتے ہیں۔"</string>
     <string name="devices_title" msgid="7701726109334110391">"آلات"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ڈیفالٹ"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 315c415..32facb3 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -4166,4 +4166,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Tarmoq tafsilotlari"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Telefoningizdagi barcha ilovalarga qurilma nomi ko‘rinadi. Qurilmalarga Bluetooth orqali ulanganingizda yoki Wi-Fi hotspot sozlaganingizda boshqa foydalanuvchilarni ularni ko‘rishi mumkin."</string>
     <string name="devices_title" msgid="7701726109334110391">"Qurilmalar"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standart"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 735428d..8014877 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Thông tin chi tiết về mạng"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Tên thiết bị của bạn sẽ hiển thị với các ứng dụng trên điện thoại. Những người khác cũng có thể thấy tên thiết bị này khi bạn kết nối với thiết bị Bluetooth hoặc thiết lập điểm phát sóng Wi-Fi."</string>
     <string name="devices_title" msgid="7701726109334110391">"Thiết bị"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Mặc định"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 67798af..29b61ab 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -4150,4 +4150,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"网络详情"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。"</string>
     <string name="devices_title" msgid="7701726109334110391">"设备"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"默认"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 203b40b..b7127dc 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -4153,4 +4153,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"網絡詳細資料"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"您的裝置名稱會在手機的應用程式上顯示。當您連接藍牙裝置或設定 Wi-Fi 熱點時，其他人亦可能會看到您的裝置名稱。"</string>
     <string name="devices_title" msgid="7701726109334110391">"裝置"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"預設"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 491f06e..1c66f08 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -4154,4 +4154,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"網路詳細資料"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"你的裝置名稱會顯示在手機的應用程式上。此外，當你連上藍牙裝置或設定 Wi-Fi 無線基地台時，其他人可能也會看到你的裝置名稱。"</string>
     <string name="devices_title" msgid="7701726109334110391">"裝置"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"預設"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ae109dd..7644db8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -4151,4 +4151,5 @@
     <string name="pref_title_network_details" msgid="7186418845727358964">"Imininingwane yenethiwekhi"</string>
     <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Igama ledivayisi yakho liyabonakala kuzinhlelo zokusebenza efonini yakho. Futhi lingabonwa ngabanye abantu uma uxhuma kumadivayisi e-Bluetooth noma usetha i-Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="7701726109334110391">"Amadivayisi"</string>
+    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Okuzenzakalelayo"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21bec16..cacd26b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9409,13 +9409,13 @@
     <string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
 
     <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which turns on emulation of a display cutout. -->
-    <string name="display_cutout_emulation">Simulate a display with a cutout</string>
+    <string name="display_cutout_emulation">Display cutout</string>
 
     <!-- [CHAR_LIMIT=NONE] Developer Settings: Search keywords for the setting which turns on emulation of a display cutout. -->
     <string name="display_cutout_emulation_keywords">display cutout, notch</string>
 
-    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off display cutout emulation. -->
-    <string name="display_cutout_emulation_none">None</string>
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off display cutout emulation, (i.e. on devices whose screen actually has a cutout, selecting this option will show that cutout).-->
+    <string name="display_cutout_emulation_device_default">Device default</string>
 
     <!-- [CHAR_LIMIT=60] Label for special access screen -->
     <string name="special_access">Special app access</string>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 3dac8b8..3d499ab 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -71,10 +71,18 @@
         <intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
     </Preference>
 
+    <!-- Safety & regulatory manual -->
+    <Preference
+        android:key="safety_info"
+        android:order="7"
+        android:title="@string/safety_and_regulatory_info">
+        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
+    </Preference>
+
     <!-- SIM status -->
     <Preference
         android:key="sim_status"
-        android:order="7"
+        android:order="8"
         android:title="@string/sim_status_title"
         settings:keywords="@string/keywords_sim_status"
         android:summary="@string/summary_placeholder"
@@ -129,14 +137,6 @@
         android:summary="@string/summary_placeholder"
         android:selectable="false"/>
 
-    <!-- Safety & regulatory manual -->
-    <Preference
-        android:key="safety_info"
-        android:order="39"
-        android:title="@string/safety_and_regulatory_info">
-        <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
-    </Preference>
-
     <!-- Manual -->
     <Preference
         android:key="manual"
@@ -166,4 +166,4 @@
         android:summary="@string/summary_placeholder"
         settings:allowDividerAbove="true"/>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/ManualDisplayActivity.java b/src/com/android/settings/ManualDisplayActivity.java
index 8be4fee..8effc7b 100644
--- a/src/com/android/settings/ManualDisplayActivity.java
+++ b/src/com/android/settings/ManualDisplayActivity.java
@@ -22,7 +22,6 @@
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -35,8 +34,7 @@
 public class ManualDisplayActivity extends Activity {
     private static final String TAG = "SettingsManualActivity";
 
-    private static final String DEFAULT_MANUAL_PATH = "/system/etc/MANUAL.html.gz";
-    private static final String PROPERTY_MANUAL_PATH = "ro.config.manual_path";
+    private static final String MANUAL_PATH = "/system/etc/MANUAL.html.gz";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,16 +45,9 @@
             finish();   // No manual to display for this device
         }
 
-        final String path = SystemProperties.get(PROPERTY_MANUAL_PATH, DEFAULT_MANUAL_PATH);
-        if (TextUtils.isEmpty(path)) {
-            Log.e(TAG, "The system property for the manual is empty");
-            showErrorAndFinish();
-            return;
-        }
-
-        final File file = new File(path);
+        final File file = new File(MANUAL_PATH);
         if (!file.exists() || file.length() == 0) {
-            Log.e(TAG, "Manual file " + path + " does not exist");
+            Log.e(TAG, "Manual file " + MANUAL_PATH + " does not exist");
             showErrorAndFinish();
             return;
         }
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 1f528e3..6276b19 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -1199,12 +1199,10 @@
             int state = mTelephonyManager.getDataState();
             switch (state) {
                 case TelephonyManager.DATA_CONNECTED:
-                    //FIXME: Replace with a TelephonyManager call
-                    phone.setUserDataEnabled(false);
+                    mTelephonyManager.setDataEnabled(false);
                     break;
                 case TelephonyManager.DATA_DISCONNECTED:
-                    //FIXME: Replace with a TelephonyManager call
-                    phone.setUserDataEnabled(true);
+                    mTelephonyManager.setDataEnabled(true);
                     break;
                 default:
                     // do nothing
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index c1489b0..300644c 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -24,7 +24,6 @@
 import android.content.Loader;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.FileProvider;
 import android.text.TextUtils;
@@ -43,8 +42,7 @@
             LoaderManager.LoaderCallbacks<File> {
     private static final String TAG = "SettingsLicenseActivity";
 
-    private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
-    private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
+    private static final String LICENSE_PATH = "/system/etc/NOTICE.html.gz";
 
     private static final int LOADER_ID_LICENSE_HTML_LOADER = 0;
 
@@ -52,10 +50,9 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        final String licenseHtmlPath =
-                SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
-        if (isFilePathValid(licenseHtmlPath)) {
-            showSelectedFile(licenseHtmlPath);
+        File file = new File(LICENSE_PATH);
+        if (isFileValid(file)) {
+            showHtmlFromUri(Uri.fromFile(file));
         } else {
             showHtmlFromDefaultXmlFiles();
         }
@@ -94,22 +91,6 @@
         }
     }
 
-    private void showSelectedFile(final String path) {
-        if (TextUtils.isEmpty(path)) {
-            Log.e(TAG, "The system property for the license file is empty");
-            showErrorAndFinish();
-            return;
-        }
-
-        final File file = new File(path);
-        if (!isFileValid(file)) {
-            Log.e(TAG, "License file " + path + " does not exist");
-            showErrorAndFinish();
-            return;
-        }
-        showHtmlFromUri(Uri.fromFile(file));
-    }
-
     private void showHtmlFromUri(Uri uri) {
         // Kick off external viewer due to WebView security restrictions; we
         // carefully point it at HTMLViewer, since it offers to decompress
@@ -138,10 +119,6 @@
         finish();
     }
 
-    private boolean isFilePathValid(final String path) {
-        return !TextUtils.isEmpty(path) && isFileValid(new File(path));
-    }
-
     @VisibleForTesting
     boolean isFileValid(final File file) {
         return file.exists() && file.length() != 0;
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index 5120cc0..c39f1d9 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -23,10 +23,14 @@
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.bluetooth.LocalBluetoothProfile;
+
 import java.util.Locale;
 
 /**
@@ -50,8 +54,10 @@
 
     // Bluetooth dependencies for the connection we are trying to establish
     private LocalBluetoothManager mBluetoothManager;
-    private BluetoothDevice mDevice;
-    private int mType;
+    @VisibleForTesting
+    BluetoothDevice mDevice;
+    @VisibleForTesting
+    int mType;
     private String mUserInput;
     private String mPasskeyFormatted;
     private int mPasskey;
@@ -82,7 +88,6 @@
         mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
-
     }
 
     @Override
@@ -96,12 +101,13 @@
 
     @Override
     public void onDialogPositiveClick(BluetoothPairingDialogFragment dialog) {
+        if (mPbapAllowed) {
+            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+        } else {
+            mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+        }
+
         if (getDialogType() == USER_ENTRY_DIALOG) {
-            if (mPbapAllowed) {
-                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
-            } else {
-                mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
-            }
             onPair(mUserInput);
         } else {
             onPair(null);
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
index 3d551cd..c9bb9b7 100644
--- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
@@ -33,6 +33,7 @@
 import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
+import java.util.Comparator;
 import java.util.List;
 
 public class EmulateDisplayCutoutPreferenceController extends
@@ -40,6 +41,8 @@
         PreferenceControllerMixin {
 
     private static final String KEY = "display_cutout_emulation";
+    private static final Comparator<OverlayInfo> OVERLAY_INFO_COMPARATOR =
+            Comparator.comparingInt(a -> a.priority);
 
     private final OverlayManagerWrapper mOverlayManager;
     private final boolean mAvailable;
@@ -120,7 +123,7 @@
 
         int current = 0;
         pkgs[0] = "";
-        labels[0] = mContext.getString(R.string.display_cutout_emulation_none);
+        labels[0] = mContext.getString(R.string.display_cutout_emulation_device_default);
 
         for (int i = 0; i < overlays.length; i++) {
             OverlayInfo o = overlays[i];
@@ -153,6 +156,7 @@
                 overlayInfos.remove(i);
             }
         }
+        overlayInfos.sort(OVERLAY_INFO_COMPARATOR);
         return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]);
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 4a3e6d4..8540f0f 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -24,8 +24,8 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.BatteryStats;
-import android.os.Bundle;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Process;
 import android.os.SystemClock;
 import android.os.UserHandle;
@@ -35,7 +35,6 @@
 import androidx.annotation.StringRes;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
-import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.util.SparseLongArray;
@@ -48,7 +47,6 @@
 import com.android.settings.fuelgauge.batterytip.AnomalyInfo;
 import com.android.settings.fuelgauge.batterytip.StatsManagerConfig;
 import com.android.settings.overlay.FeatureFactory;
-
 import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
 import com.android.settingslib.utils.PowerUtil;
 
@@ -93,14 +91,14 @@
 
     public static BatteryUtils getInstance(Context context) {
         if (sInstance == null || sInstance.isDataCorrupted()) {
-            sInstance = new BatteryUtils(context);
+            sInstance = new BatteryUtils(context.getApplicationContext());
         }
         return sInstance;
     }
 
     @VisibleForTesting
     BatteryUtils(Context context) {
-        mContext = context.getApplicationContext();
+        mContext = context;
         mPackageManager = context.getPackageManager();
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         mPowerUsageFeatureProvider = FeatureFactory.getFactory(
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index 3b39e38..0054e9b 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -42,7 +42,6 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.telephony.data.ApnSetting;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -54,8 +53,6 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.dataconnection.ApnSettingUtils;
-import com.android.internal.telephony.uicc.IccRecords;
 import com.android.internal.telephony.uicc.UiccController;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
@@ -63,7 +60,8 @@
 
 import java.util.ArrayList;
 
-public class ApnSettings extends RestrictedSettingsFragment {
+public class ApnSettings extends RestrictedSettingsFragment
+        implements Preference.OnPreferenceChangeListener {
     static final String TAG = "ApnSettings";
 
     public static final String EXTRA_POSITION = "position";
@@ -277,34 +275,27 @@
     }
 
     private void fillList() {
-        final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
                 : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        final String mccmnc = mSubscriptionInfo == null ? "" : tm.getSimOperator(subId);
-        Log.d(TAG, "mccmnc = " + mccmnc);
-        StringBuilder where = new StringBuilder("numeric=\"" + mccmnc +
-                "\" AND NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND user_visible!=0");
+        final Uri simApnUri = Uri.withAppendedPath(Telephony.Carriers.SIM_APN_URI,
+                String.valueOf(subId));
+        StringBuilder where = new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
+                + "user_visible!=0");
 
         if (mHideImsApn) {
             where.append(" AND NOT (type='ims')");
         }
 
-        Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI,
-                CARRIERS_PROJECTION, where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER);
+        Cursor cursor = getContentResolver().query(simApnUri,
+                CARRIERS_PROJECTION, where.toString(), null,
+                Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         if (cursor != null) {
-            IccRecords r = null;
-            if (mUiccController != null && mSubscriptionInfo != null) {
-                r = mUiccController.getIccRecords(
-                        SubscriptionManager.getPhoneId(subId), UiccController.APP_FAM_3GPP);
-            }
-            PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
-            apnList.removeAll();
+            PreferenceGroup apnPrefList = (PreferenceGroup) findPreference("apn_list");
+            apnPrefList.removeAll();
 
-            ArrayList<ApnPreference> mnoApnList = new ArrayList<ApnPreference>();
-            ArrayList<ApnPreference> mvnoApnList = new ArrayList<ApnPreference>();
-            ArrayList<ApnPreference> mnoMmsApnList = new ArrayList<ApnPreference>();
-            ArrayList<ApnPreference> mvnoMmsApnList = new ArrayList<ApnPreference>();
+            ArrayList<ApnPreference> apnList = new ArrayList<ApnPreference>();
+            ArrayList<ApnPreference> mmsApnList = new ArrayList<ApnPreference>();
 
             mSelectedKey = getSelectedApnKey();
             cursor.moveToFirst();
@@ -313,15 +304,16 @@
                 String apn = cursor.getString(APN_INDEX);
                 String key = cursor.getString(ID_INDEX);
                 String type = cursor.getString(TYPES_INDEX);
-                String mvnoType = cursor.getString(MVNO_TYPE_INDEX);
-                String mvnoMatchData = cursor.getString(MVNO_MATCH_DATA_INDEX);
                 int edited = cursor.getInt(EDITED_INDEX);
+                mMvnoType = cursor.getString(MVNO_TYPE_INDEX);
+                mMvnoMatchData = cursor.getString(MVNO_MATCH_DATA_INDEX);
 
                 ApnPreference pref = new ApnPreference(getPrefContext());
 
                 pref.setKey(key);
                 pref.setTitle(name);
                 pref.setPersistent(false);
+                pref.setOnPreferenceChangeListener(this);
                 pref.setSubId(subId);
                 if (mHidePresetApnDetails && edited == Telephony.Carriers.UNEDITED) {
                     pref.setHideDetails();
@@ -335,43 +327,20 @@
                     if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
                         pref.setChecked();
                     }
-                    addApnToList(pref, mnoApnList, mvnoApnList, r, mvnoType, mvnoMatchData);
+                    apnList.add(pref);
                 } else {
-                    addApnToList(pref, mnoMmsApnList, mvnoMmsApnList, r, mvnoType, mvnoMatchData);
+                    mmsApnList.add(pref);
                 }
                 cursor.moveToNext();
             }
             cursor.close();
 
-            if (!mvnoApnList.isEmpty()) {
-                mnoApnList = mvnoApnList;
-                mnoMmsApnList = mvnoMmsApnList;
-
-                // Also save the mvno info
+            for (Preference preference : apnList) {
+                apnPrefList.addPreference(preference);
             }
-
-            for (Preference preference : mnoApnList) {
-                apnList.addPreference(preference);
+            for (Preference preference : mmsApnList) {
+                apnPrefList.addPreference(preference);
             }
-            for (Preference preference : mnoMmsApnList) {
-                apnList.addPreference(preference);
-            }
-        }
-    }
-
-    private void addApnToList(ApnPreference pref, ArrayList<ApnPreference> mnoList,
-                              ArrayList<ApnPreference> mvnoList, IccRecords r, String mvnoType,
-                              String mvnoMatchData) {
-        if (r != null && !TextUtils.isEmpty(mvnoType) && !TextUtils.isEmpty(mvnoMatchData)) {
-            if (ApnSettingUtils.mvnoMatches(r, ApnSetting.getMvnoTypeIntFromString(mvnoType),
-                    mvnoMatchData)) {
-                mvnoList.add(pref);
-                // Since adding to mvno list, save mvno info
-                mMvnoType = mvnoType;
-                mMvnoMatchData = mvnoMatchData;
-            }
-        } else {
-            mnoList.add(pref);
         }
     }
 
@@ -418,6 +387,7 @@
         startActivity(intent);
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         Log.d(TAG, "onPreferenceChange(): Preference - " + preference
                 + ", newValue - " + newValue + ", newValue type - "
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 89e1eb8..72714d5 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -94,7 +94,8 @@
     @Override
     public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
         if (mPowerUsageFeatureProvider == null) {
-            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(context);
+            mPowerUsageFeatureProvider = new PowerUsageFeatureProviderImpl(
+                    context.getApplicationContext());
         }
         return mPowerUsageFeatureProvider;
     }
@@ -102,7 +103,8 @@
     @Override
     public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
         if (mDashboardFeatureProvider == null) {
-            mDashboardFeatureProvider = new DashboardFeatureProviderImpl(context);
+            mDashboardFeatureProvider = new DashboardFeatureProviderImpl(
+                    context.getApplicationContext());
         }
         return mDashboardFeatureProvider;
     }
@@ -118,10 +120,11 @@
     @Override
     public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
         if (mApplicationFeatureProvider == null) {
-            mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(context,
-                    new PackageManagerWrapper(context.getPackageManager()),
+            final Context appContext = context.getApplicationContext();
+            mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(appContext,
+                    new PackageManagerWrapper(appContext.getPackageManager()),
                     AppGlobals.getPackageManager(),
-                    (DevicePolicyManager) context
+                    (DevicePolicyManager) appContext
                             .getSystemService(Context.DEVICE_POLICY_SERVICE));
         }
         return mApplicationFeatureProvider;
@@ -138,12 +141,14 @@
     @Override
     public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
         if (mEnterprisePrivacyFeatureProvider == null) {
-            mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(context,
-                    (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE),
-                    new PackageManagerWrapper(context.getPackageManager()),
-                    UserManager.get(context),
-                    (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
-                    context.getResources());
+            final Context appContext = context.getApplicationContext();
+            mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(appContext,
+                    (DevicePolicyManager) appContext
+                            .getSystemService(Context.DEVICE_POLICY_SERVICE),
+                    new PackageManagerWrapper(appContext.getPackageManager()),
+                    UserManager.get(appContext),
+                    (ConnectivityManager) appContext.getSystemService(Context.CONNECTIVITY_SERVICE),
+                    appContext.getResources());
         }
         return mEnterprisePrivacyFeatureProvider;
     }
@@ -172,7 +177,8 @@
     @Override
     public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
         if (mSuggestionFeatureProvider == null) {
-            mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(context);
+            mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(
+                    context.getApplicationContext());
         }
         return mSuggestionFeatureProvider;
     }
@@ -180,7 +186,7 @@
     @Override
     public UserFeatureProvider getUserFeatureProvider(Context context) {
         if (mUserFeatureProvider == null) {
-            mUserFeatureProvider = new UserFeatureProviderImpl(context);
+            mUserFeatureProvider = new UserFeatureProviderImpl(context.getApplicationContext());
         }
         return mUserFeatureProvider;
     }
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 4b9a7ec..b327f02 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -382,7 +382,7 @@
     void registerIntentToUri(IntentFilter intentFilter, Uri sliceUri) {
         Log.d(TAG, "Registering Uri for broadcast relay: " + sliceUri);
         mRegisteredUris.add(sliceUri);
-        SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceBroadcastReceiver.class,
+        SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceRelayReceiver.class,
                 intentFilter);
     }
 
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index d81734a..53fa4be 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -44,7 +44,6 @@
 import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiSliceBuilder;
-import com.android.settingslib.SliceBroadcastRelay;
 
 /**
  * Responds to actions performed on slices and notifies slices of updates in state changes.
@@ -84,12 +83,6 @@
             case ACTION_ZEN_MODE_SLICE_CHANGED:
                 ZenModeSliceBuilder.handleUriChange(context, intent);
                 break;
-            default:
-                final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
-                if (!TextUtils.isEmpty(uriString)) {
-                    final Uri uri = Uri.parse(uriString);
-                    context.getContentResolver().notifyChange(uri, null /* observer */);
-                }
         }
     }
 
diff --git a/src/com/android/settings/slices/SliceRelayReceiver.java b/src/com/android/settings/slices/SliceRelayReceiver.java
new file mode 100644
index 0000000..c8ec12e
--- /dev/null
+++ b/src/com/android/settings/slices/SliceRelayReceiver.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.slices;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+import com.android.settingslib.SliceBroadcastRelay;
+
+/**
+ * Receives broadcasts to notify that Settings Slices are potentially stale.
+ */
+public class SliceRelayReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
+        if (!TextUtils.isEmpty(uriString)) {
+            final Uri uri = Uri.parse(uriString);
+            context.getContentResolver().notifyChange(uri, null /* observer */);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wrapper/OverlayManagerWrapper.java b/src/com/android/settings/wrapper/OverlayManagerWrapper.java
index 6e3c234..371504f 100644
--- a/src/com/android/settings/wrapper/OverlayManagerWrapper.java
+++ b/src/com/android/settings/wrapper/OverlayManagerWrapper.java
@@ -81,18 +81,21 @@
         public static final String CATEGORY_THEME = android.content.om.OverlayInfo.CATEGORY_THEME;
         public final String packageName;
         public final String category;
+        public final int priority;
         private final boolean mEnabled;
 
-        public OverlayInfo(String packageName, String category, boolean enabled) {
+        public OverlayInfo(String packageName, String category, boolean enabled, int priority) {
             this.packageName = packageName;
             this.category = category;
             mEnabled = enabled;
+            this.priority = priority;
         }
 
         public OverlayInfo(android.content.om.OverlayInfo info) {
             mEnabled = info.isEnabled();
             category = info.category;
             packageName = info.packageName;
+            priority = info.priority;
         }
 
         public boolean isEnabled() {
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index 0e1384d..7ba5787 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -26,7 +26,6 @@
 import android.app.Application;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.SystemProperties;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
@@ -67,8 +66,6 @@
 
     @Test
     public void testOnCreateWithValidHtmlFile() {
-        SystemProperties.set("ro.config.license_path", "/system/etc/NOTICE.html.gz");
-
         doReturn(true).when(mActivity).isFileValid(any());
         mActivity.onCreate(null);
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
new file mode 100644
index 0000000..b28a8b2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.bluetooth;
+
+import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothPan;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
+public class BluetoothPairingControllerTest {
+    @Mock
+    private BluetoothDevice mBluetoothDevice;
+    private Context mContext;
+    private BluetoothPairingController mBluetoothPairingController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        final Intent intent = new Intent();
+        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
+        mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
+    }
+
+    @Test
+    public void onDialogPositiveClick_confirmationDialog_setPBAP() {
+        mBluetoothPairingController.mType = PAIRING_VARIANT_CONSENT;
+        mBluetoothPairingController.onCheckedChanged(null, true);
+
+        mBluetoothPairingController.onDialogPositiveClick(null);
+
+        verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
index 34a0581..68a0ffd 100644
--- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -17,6 +17,8 @@
 package com.android.settings.development;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.AdditionalMatchers.aryEq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
@@ -38,6 +40,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.AdditionalMatchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -46,10 +49,10 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 public class EmulateDisplayCutoutPreferenceControllerTest {
 
-    private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false);
-    private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true);
-    private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false);
-    private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true);
+    private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false, 1);
+    private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true, 1);
+    private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false, 2);
+    private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true, 2);
 
     @Mock
     private Context mContext;
@@ -128,6 +131,16 @@
     }
 
     @Test
+    public void ordered_by_priority() throws Exception {
+        mockCurrentOverlays(TWO_DISABLED, ONE_DISABLED);
+
+        mController.updateState(null);
+
+        verify(mPreference).setEntryValues(
+                aryEq(new String[]{"", ONE_DISABLED.packageName, TWO_DISABLED.packageName}));
+    }
+
+    @Test
     public void onDeveloperOptionsSwitchDisabled() throws Exception {
         mockCurrentOverlays(ONE_ENABLED, TWO_DISABLED);
         final PreferenceScreen screen = mock(PreferenceScreen.class);
@@ -145,7 +158,8 @@
                 mOverlayManager);
     }
 
-    private static OverlayInfo createFakeOverlay(String pkg, boolean enabled) {
-        return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled);
+    private static OverlayInfo createFakeOverlay(String pkg, boolean enabled, int priority) {
+        return new OverlayInfo(pkg, DisplayCutout.EMULATION_OVERLAY_CATEGORY, enabled,
+                priority);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index d5f3e2b..9ca61a4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.fuelgauge;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doNothing;
@@ -89,6 +90,7 @@
 
         mShadowContext = RuntimeEnvironment.application;
         FakeFeatureFactory.setupForTest();
+        when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
@@ -118,7 +120,7 @@
     @Test
     public void testHandlePreferenceTreeClick_restrictApp_showDialog() {
         doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager)
-            .checkOpNoThrow(anyInt(), anyInt(), anyString());
+                .checkOpNoThrow(anyInt(), anyInt(), anyString());
 
         mController.handlePreferenceTreeClick(mPreference);
 
@@ -128,7 +130,7 @@
     @Test
     public void testHandlePreferenceTreeClick_unRestrictApp_showDialog() {
         doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager)
-            .checkOpNoThrow(anyInt(), anyInt(), anyString());
+                .checkOpNoThrow(anyInt(), anyInt(), anyString());
 
         mController.handlePreferenceTreeClick(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index 25f0d0c..f8172e8 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -159,8 +159,12 @@
 
         assertThat(fakeToggleController.isChecked()).isFalse();
 
-        final Uri expectedUri = SliceBuilderUtils.getUri(
-                SettingsSlicesContract.PATH_SETTING_ACTION + "/" + key, false);
+        final Uri expectedUri = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(key)
+                .build();
         verify(resolver).notifyChange(eq(expectedUri), eq(null));
     }
 
diff --git a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java
new file mode 100644
index 0000000..3388a16
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.android.settings.slices;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ContentResolver;
+import android.content.Context;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.SliceBroadcastRelay;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SliceRelayReceiverTest {
+
+  private Context mContext;
+  private SliceRelayReceiver mSliceRelayReceiver;
+
+  @Before
+  public void setUp() {
+      mContext = spy(RuntimeEnvironment.application);
+      mSliceRelayReceiver = new SliceRelayReceiver();
+  }
+
+
+  @Test
+  public void onReceive_extraUri_notifiesChangeOnUri() {
+      // Monitor the ContentResolver
+      final ContentResolver resolver = spy(mContext.getContentResolver());
+      doReturn(resolver).when(mContext).getContentResolver();
+
+      final Uri uri = new Uri.Builder()
+          .scheme(ContentResolver.SCHEME_CONTENT)
+          .authority(SettingsSlicesContract.AUTHORITY)
+          .appendPath("path")
+          .build();
+
+      final Intent intent = new Intent();
+    intent.putExtra(SliceBroadcastRelay.EXTRA_URI, uri.toString());
+
+    mSliceRelayReceiver.onReceive(mContext, intent);
+
+    verify(resolver).notifyChange(eq(uri), any());
+
+  }
+}