[automerger skipped] Merge "Added sub id to SmsCbMessage" am: a0891719 am: f44bbdd6
am: 47e4d45c -s ours
am skip reason: change_id Ibac8d3e77be15b618dd8b11878c984617614586c with SHA1 64049c2f is in history
Change-Id: Idcf46deb36ba8dfb797387e0b9d7e460824ee355