am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev

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