Merge "Modified so that if network does not support multipart / data SMS, it skips this test." into froyo