Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc am: 540eca1aac am: d630a308c0
am: f0b40b6764 -s ours
Change-Id: I2877281247a78e4d814a1df8bea71fd3c37b1962
This commit is contained in: