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

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