DO NOT MERGE Stricter NetworkNotificationManagerTest
am: a865790a5b

Change-Id: I94ea5c6994d181e730ec4f49e98001eb81ed8740