Merge "Remove getAllVpnInfo from ConnectivityServiceMock." into pi-dev