am 06d3df9a: Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"

* commit '06d3df9aa05a0221a4cdc4245ae73f7936616170':
  Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony