Refactor NetworkNotificationManager.
am: 0b59906768

Change-Id: I0084400264ccfc352f50e58acda9b8e056dbf766