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

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