am 72a4c15c: (-s ours) am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev

* commit '72a4c15c49332965251315901f44905a66653adc':
  Hide new methods in notificationlistenerservice DO NOT MERGE