Merge "Mock out usageStats in NotificationManagerServiceTests" into oc-dev
am: fd0b15c196

Change-Id: I56ff2491ee5fd1d72f215e41a4d6ee2ee535ab8a