[automerger skipped] Merge "Added sub id to SmsCbMessage" am: 258e925c am: 35132f9a
am: b496fd87 -s ours
am skip reason: change_id I23f61e77f6a9a16ce77f7892ba96fd7485c555a4 with SHA1 750b8b19 is in history
Change-Id: I114990009070c2adffa0249a5109a3d02f7a1c94