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