Merge "move short code definitions to SmsManager Test API"