Merge "Do not setSubId on SmsMessage."