Merge "Reenable (no longer) failing test" into main

tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java

@@ -189,8 +189,8 @@ public class ApprovalPreferenceControllerTest {
 
     @Test
     @EnableFlags(Flags.FLAG_MODES_API)
-    @Ignore("b/339550695")
     public void disable() {
+        when(mNm.isNotificationPolicyAccessGrantedForPackage(anyString())).thenReturn(false);
         mController.disable(mCn);
         verify(mFeatureFactory.metricsFeatureProvider).action(
                 mContext,