am bd042089: DO NOT MERGE Fix build for notification listener internal api change

* commit 'bd042089891d749855be5d39d76380e7c7f85e6f':
  DO NOT MERGE Fix build for notification listener internal api change