Refactor NetworkNotificationManager. am: 0b59906768 am: a6dcb89e6d am: 4e0916b416
am: 12eab8b34b

Change-Id: I1249d019ce449f8721541c138f89b98230a67b57