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

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