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

Change-Id: I5cafd42d4b9b5251f51da34488b94c0ca40be76b