[automerger skipped] Merge "move CellBroadcastMessage from telephony-common to...
[automerger skipped] Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368a am: 04bcf7ec am: 67f5eb67
am: b5443d9d -s ours
am skip reason: change_id Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa with SHA1 86a8e9b6 is in history
Change-Id: I1a424edad11cbbeb87f6f4da9d50cefea4960bce