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

Change-Id: I401e171c983b313c92afa17e6d8fe78c52d54b17