Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc am: 036ab4d193 am: a5e0160f03
am: 2c05563e78  -s ours

Change-Id: I2877281247a78e4d814a1df8bea71fd3c37b1962