Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest."
am: b268cb5c6e

Change-Id: I44b66d1d606c5bb454ae49de234cfa0dbbb2bed2
tree: d01d3fddd5f345f432159f0afd3ac1efbf553340
  1. core/
  2. services/
  3. tests/