am 88c26d46: am 4a6b0c93: am 79fdfecb: am 954ca10e: am ad285c16: Merge "Revert...

am 88c26d46: 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 '88c26d46':
  Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."