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

Change-Id: I43c0b5a6f7b5227c7b01f092b96112875cad1ac2