Merge "Do not setSubId on SmsMessage." am: 0330797929 am: 50080aa1ae am: a9a1cc68f7

Change-Id: I2be56203df91f1611b6276c22b1d7a9c380bf0b9