am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev

* commit '665935c10ad281721c495621fab7561f2a28842e':
  Enable SMS short code patterns to be updated from secure settings.