Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev
am: a03bf7acd1

Change-Id: I4ca3dcc293be5408a6f207e1ac1a7229a915723a
tree: 9c7f854ee24a6a60808ea9dff072689e148f87f4
  1. core/
  2. services/
  3. tests/