Merge "Do not setSubId on SmsMessage."
am: 0330797929

Change-Id: I7b7eb6c747ce7e9f82f0125519a6bc2fafaa3ef2