[automerger skipped] Merge "move short code definitions to SmsManager Test API" am: b6399511f8
am: 05a10d2f89 -s ours
am skip reason: change_id I6a5ba2439713105b25913ba8eb081abfaafd1a2e with SHA1 9c7fad9235 is in history

Change-Id: Iea5ea3522f36eb0f4c18ddb7e9b25b25d1837422