Merge "Refactor TestNetworkCallback out of ConnectivityServiceTest." am: b268cb5c6e am: 81d9d197a3
am: 393826d56e

Change-Id: Id90f1ca9fe90efc20d40cc31b495209b1981fdd6