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

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