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

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