am bdb9f1b6: am ec1ecc09: Merge "Move SmsUsageMonitorShortCodeTest from...
am bdb9f1b6: am ec1ecc09: Merge "Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests"
* commit 'bdb9f1b6':
Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests