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

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