[automerger skipped] Merge "move CellBroadcastMessage from telephony-common to app" am: 17518fa149 am: e2d15a24c1 am: 3b5788f3fe
am: 1dedd7b486 -s ours
am skip reason: change_id I07604101e3dccaa8e1539fa2644ef08da54d4533 with SHA1 515285b1b5 is in history

Change-Id: Ibbc4c4459ee7db3b4e24c180b5e4f217910d3182