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

Change-Id: Id7e9c29b8e417739bc3bbe50d630b88ffa68936e