am 1344ec19: am 77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev

* commit '1344ec191894e88c998ff091c2afc16e870c46bc':
  Follow API changes to NotificationListener.