Merge "move short code definitions to SmsManager Test API"
am: b6399511f8

Change-Id: I81bc6dffdd76c9930257e0f7612107145c13d5f6