Merge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev