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

* commit 'a7b6cbf1a3fe91bdbb01edd9a656a62c40c302fd':
  API cleanup: NotificationListener