Merge "Add isAlwaysOnVpnPackageSupported to ConnectivityServiceMock"