am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev

* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
  DO NOT MERGE Reduce chance of notification listener dropped messages.