am 4a6b0c93: am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev

* commit '4a6b0c93f8ca7e78a332696043be3b73563ea037':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."