[automerger skipped] Merge "move SmsUsageMonitor short code definitions to...
[automerger skipped] Merge "move SmsUsageMonitor short code definitions to SmsManager API" am: 4b9c93ba am: 980ae94c -s ours
am: d32bfd5f -s ours
am skip reason: change_id Ib91f53601996d4211cdf4dec2b1fff4b21a73792 with SHA1 1de1e1e6 is in history
Change-Id: If288985a2409e67d5e0820f2866dcf3dab40d000