Merge "Add new error code in SmsManager"