[automerger skipped] Merge "Integrate testNetworkService and Manager with Connectivity stack" am: b86c3255fd am: 016ac0a953
am: e942aafb0a -s ours
am skip reason: change_id I741ef9cdf4bd4125d9129af3a030edf32f438e4f with SHA1 99a4841954 is in history

Change-Id: Ic64ea5abdc07034b674c1365de7af75abd94d119