Move NAS selection to 'special app access'

Test: manual
Fixes: 130169253
Change-Id: I0e69b11c557bc153cee0073bb2e982e3ee36e721
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 97a4182..cf25a15 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -19,13 +19,6 @@
                   android:title="@string/configure_notification_settings"
                   android:key="configure_notification_settings">
 
-    <com.android.settingslib.widget.apppreference.AppPreference
-        android:key="notification_assistant"
-        android:title="@string/notification_assistant_title"
-        android:summary="@string/summary_placeholder"
-        settings:fragment="com.android.settings.notification.NotificationAssistantPicker"
-        settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
-
     <SwitchPreference
         android:key="asst_capability_prioritizer"
         android:title="@string/asst_capability_prioritizer_title"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 9be01f9..d09ca97 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -65,6 +65,13 @@
             android:value="com.android.settings.Settings$WriteSettingsActivity" />
     </Preference>
 
+    <com.android.settingslib.widget.apppreference.AppPreference
+        android:key="notification_assistant"
+        android:title="@string/notification_assistant_title"
+        android:summary="@string/summary_placeholder"
+        settings:fragment="com.android.settings.notification.NotificationAssistantPicker"
+        settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
+
     <Preference
         android:key="notification_access"
         android:title="@string/manage_notification_access_title"