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