Merge "Move NetworkNotificationManagerTest to tests/net" am: c01fbf0f0c am: 9fdc903af7 am: 777bf77c2c  -s ours
am: fe95db3d1b

Change-Id: Ibba873042627166120f4040896c58e96bff2b085