[automerger skipped] Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." am: e7418497c4 am: bcf39bac19 -s ours am: 37661a2ead -s ours
am: f1dcd94853 -s ours
am skip reason: change_id I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d with SHA1 6499e6d95b is in history

Change-Id: Id980f957d2ce16638c0a94e0edd31a1774ee468e