am 0275552b: resolved conflicts for merge of f364fccf to jb-dev-plus-aosp

* commit '0275552bba7937c5cac07239336cddeb2b4a5bd2':
  Fix detection of CDMA cell broadcast messages.