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