am 38aaaa64: (-s ours) am 1b4c3db6: Merge "RIL: Support SMS on IMS, DO NOT MERGE" into jb-mr2-dev

* commit '38aaaa6494bd6deb42de8397fb421d1fb3b4e352':
  RIL: Support SMS on IMS, DO NOT MERGE