Merge "Fix ConnectivityServiceTest fail."
am: fa8fc65340

Change-Id: If3f7a3cbf2ed1a180a3b09872512a5f91bddd89c