Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340 am: ccc12f673b
am: 7d21507852

Change-Id: Ic77ef73841266da487401ffd657ef63562b6fc1e