am e2d70f12: am 5cc22f99: Merge "add more data integrity tests for NotificationListenerService." into jb-mr2-dev

* commit 'e2d70f1230f8c4fb65e041b6de9f4fa1c399c511':
  add more data integrity tests for NotificationListenerService.