am f5dcb6cb: am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev automerge: bbadf11

* commit 'f5dcb6cbb9db1099e458b9a7df0a21baffbf77cc':
  NoMan: Cancel previous instance of ignored notification