Merge "Merge "Make sure on non-dds phone, try MMS data connection when PS is...
Merge "Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." into qt-dev am: 1f7ee0bc am: 71c3b209" into qt-r1-dev-plus-aosp
am: 12be0001
Change-Id: I876a3a11a2579c2f1033c6a3cf8930c271edc839