[automerger skipped] Merge "Add CDMA SCP message handling to CellBroadcast module" am: f0e75a656c am: 84913b808f
am: 6404defafe -s ours
am skip reason: change_id I4729cb98dec46560aefee570af58ff4a737cacf3 with SHA1 e89a1eb05d is in history

Change-Id: Ic6e83e6369373389675455a78c7d3c733d4998c8