am 045ffe31: am 226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev

* commit '045ffe31056b340fb962c4fef3ed3dbf00b5d251':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).