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: f7b21cba am: 6dcb30cc" into qt-r1-dev-plus-aosp
am: f6647778
Change-Id: Id503694ce770160e797d97be42212e1d0a7d828a