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