Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2
am: 04bcf7ec6c

Change-Id: I4cb440a59d5f6de5815b8ee942b3f29d2a770d4b