am 4d30d342: Merge "Add vvm short codes to white list for sms messages." into mnc-dev

* commit '4d30d342941effb8ac0b17650473a8b937aee591':
  Add vvm short codes to white list for sms messages.