Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached."
am: e7418497c4

Change-Id: I6b9ed84226e7de7cf95082d8c55e91eff32e1e75