Merge "Delete deleteConversationNotificationChannels from NotificationManagerService." into sc-dev