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

Change-Id: I2f08915cb59ae1999922ca4bc874b9d1903fc053