Merge "Integrate testNetworkService and Manager with Connectivity stack" am: b86c3255fd
am: 016ac0a953

Change-Id: If9efbc3e0b3f0949286a2a5ad8226009ebbcfc07