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

Change-Id: I571e583d896841c814efe58b8c0875fa9cd3873c