Merge "Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7ac -s ours am: a3b78abb -s ours" into oc-mr1-dev-plus-aosp