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

* commit '77f71cb226203bf3f87eec749296feb3ecd18f43':
  Follow API changes to NotificationListener.