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

* commit '3d9a5607ba547340841bc965ac77c2589ea40da5':
  Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony