am 296f0a05: Merge "Add PhoneNumberUtils method for CDMA SMS number formatting." into klp-dev

* commit '296f0a05dcb099e64e4fe962c6cd667c5e1ffd87':
  Add PhoneNumberUtils method for CDMA SMS number formatting.