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

Change-Id: I1029effeff09fb27540badf91d5a4baa03a8695d