Merge "Make sure on non-dds phone, try MMS data connection when PS is not...
Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev am: 1f7ee0bc am: ea9bc394
am: affcd63a
Change-Id: I5788c3683c6a2255715fa4435cb0a44e38e48a30