[automerger skipped] Merge "Providing a way for user to allow MMS data even if...
[automerger skipped] Merge "Providing a way for user to allow MMS data even if mobile data is off." am: 346fbe85
am: cb2776db -s ours
am skip reason: change_id I64d0b7f271858d60f8c292af0aa5371ad21d9805 with SHA1 392d2250 is in history
Change-Id: Idb7f5abc2cb6a2f2e0c36680fb135d779ba921fe