Merge "move CellBroadcastMessage from telephony-common to app"
am: 17518fa149

Change-Id: I6cfcb2bfcb6d4c326f4a54469b982bc7f9a2932d