Merge "Add CDMA SCP message handling to CellBroadcast module"
am: f0e75a656c

Change-Id: I25dcb98f1452678717c2be69ddd1029ed1761e33