[automerger skipped] Merge "For non-dds MMS, try setup data call even if data...
[automerger skipped] Merge "For non-dds MMS, try setup data call even if data not attached." am: 66030cea am: c4683658
am: 27fbdb11 -s ours
am skip reason: change_id I47c67d5f453263175ec96a724c7255aadf037215 with SHA1 aeee86d3 is in history
Change-Id: I7598b8200e3020bbd8a2d87dac8243cb66dda18e