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

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