[automerger skipped] Added sub id to SmsCbMessage am: 0bd7e43bca am: 96b5ece9ed
am: 6a07f30f88 -s ours
am skip reason: change_id I26bb40f3252374f2c4ce4a6fbfd1038b71edc34d with SHA1 515f34c0b1 is in history

Change-Id: I321b4d64d6a72c3d0a8ae8d5d963d2a8557bddfd