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

Change-Id: I3919b9b9f1f94fc7e8137dbd7ff1d71b2ca297b3