Merge changes I9c59a934,I11743d78 into sc-dev

* changes:
  NotificationManagerService: check cache before checking contacts
  UsageStatsService: rewrite locking to avoid contention post-unlock