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

Change-Id: Ib04804cffa258bd7e2f9fdadadfe59ba67302a44