Merge "Providing a way for user to allow MMS data even if mobile data is off." into qt-dev
am: d9b0c570c5

Change-Id: I028ee37326fb8294d0079f55d1336d8fd8cefd98