am f2ae4cb7: am 12b06cb6: am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into mnc-dr-dev

* commit 'f2ae4cb731a2bc45db3060fa84d372dbc3358909':
  Fix MMS delivery issue by permitting HTTP from Settings app.