Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc
am: 036ab4d193

Change-Id: I839ed526e802b88bbed490b611f90d829b952f26