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

Change-Id: Ifc208e00e05efb29eaa2ab37abdc66d8c7ed8f4f