am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev

* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
  Fix a race in NotificationManager with Listeners