Merge "Add NotificationGroupManagerTest"