diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceController.java
index 743fd55b70e..602b4948496 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceController.java
@@ -58,19 +58,15 @@ public class PreUpgradePreferenceController extends BasePreferenceController {
 
     @Override
     public int getAvailabilityStatus() {
-        if (mNm.isNotificationListenerAccessGranted(mCn)) {
-            mNlf = mNm.getListenerFilter(mCn, mUserId);
+        mNlf = mNm.getListenerFilter(mCn, mUserId);
 
-            if (mTargetSdk > Build.VERSION_CODES.S) {
-                return CONDITIONALLY_UNAVAILABLE;
-            }
-
-            if (!mNlf.areAllTypesAllowed() || !mNlf.getDisallowedPackages().isEmpty()) {
-                return CONDITIONALLY_UNAVAILABLE;
-            }
-            return AVAILABLE;
-        } else {
+        if (mTargetSdk > Build.VERSION_CODES.S) {
             return CONDITIONALLY_UNAVAILABLE;
         }
+
+        if (!mNlf.areAllTypesAllowed() || !mNlf.getDisallowedPackages().isEmpty()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return AVAILABLE;
     }
 }
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceControllerTest.java
index d4008d40602..12973527abe 100644
--- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceControllerTest.java
@@ -62,17 +62,8 @@ public class PreUpgradePreferenceControllerTest {
         mController.setUserId(0);
     }
 
-    @Test
-    public void testAvailable_notGranted() {
-        when(mNm.isNotificationListenerAccessGranted(any())).thenReturn(false);
-        mController.setTargetSdk(Build.VERSION_CODES.S);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
     @Test
     public void testAvailable_lowTargetSdk_noCustomizations() {
-        when(mNm.isNotificationListenerAccessGranted(any())).thenReturn(true);
         mController.setTargetSdk(Build.VERSION_CODES.S);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
 
@@ -81,7 +72,6 @@ public class PreUpgradePreferenceControllerTest {
 
     @Test
     public void testAvailable_lowTargetSdk_customizations() {
-        when(mNm.isNotificationListenerAccessGranted(any())).thenReturn(true);
         mController.setTargetSdk(Build.VERSION_CODES.S);
         NotificationListenerFilter nlf = new NotificationListenerFilter();
         nlf.setTypes(FLAG_FILTER_TYPE_CONVERSATIONS);
@@ -92,7 +82,6 @@ public class PreUpgradePreferenceControllerTest {
 
     @Test
     public void testAvailable_highTargetSdk_noCustomizations() {
-        when(mNm.isNotificationListenerAccessGranted(any())).thenReturn(true);
         mController.setTargetSdk(Build.VERSION_CODES.CUR_DEVELOPMENT + 1);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());