Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev am: 1f7ee0bc98
am: ea9bc39432

Change-Id: Idbb392bbe485b55c94fff35c1bbc27a1799a3433