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

Change-Id: Ifb212ff7f554a7c851db2df8c98ff3fbc45209b0