Merge "Fix behavior of getNotificationChannelGroups"