Merge "Declare new SMS error code in SmsManager"