Merge "Correct test" into tm-dev am: ddb4ee4491

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282483

Change-Id: I0793dc115ebb08bdcebdfdce346f31bd93c1d3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

@@ -9348,8 +9348,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
                 nb.build(), UserHandle.getUserHandleForUid(mUid), null, 0);
         NotificationRecord r = new NotificationRecord(mContext, sbn, mTestNotificationChannel);
 
-        mBinderService.setNotificationsEnabledForPackage(
-                r.getSbn().getPackageName(), r.getUid(), false);
+        when(mPermissionHelper.hasPermission(mUid)).thenReturn(false);
 
         // normal blocked notifications - blocked
         mService.addEnqueuedNotification(r);