Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc am: ac7e9a2b47 am: 073a0ac614
am: 04d4730e15 -s ours
Change-Id: I2877281247a78e4d814a1df8bea71fd3c37b1962
This commit is contained in: