Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev