Merge "Decouple VpnManagerService from ConnectivityServiceTest"