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

Change-Id: I98c775f946704f49d1986502aab97799e9ce15f6