Merge "API improvements for creating NotificationChannels"