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

Change-Id: I20ba3873576045272fc30e0769842064041333e1