Refactor NetworkNotificationManager. am: 0b59906768
am: a6dcb89e6d

Change-Id: I635e0dfca74a1dc3e0291c42aeed7c3a6a978dbd