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

Change-Id: I10b0e57ac7a9000ceb662e3e9358f4fca5fcfdb1