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

Change-Id: Ieb76ab05d801e02a644ac614ee78df94492ed0a3