am 4a02a5cc: am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-dev

* commit '4a02a5ccfc3363f61a1ce6fdb76008f1cdd5c41a':
  Fix detection of CDMA CMAS cell broadcasts.