Merge "Test to null-check NotificationEntryManager.performRemoveNotification()"