am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev

* commit '4064af9b096dfdf317d158c8aafd396c86f3fd0a':
  API cleanup: NotificationListener