[automerger skipped] Merge "move CellBroadcastMessage from telephony-common to app" am: 12a7368ad2
am: 04bcf7ec6c
am: 67f5eb6746
am:b5443d9d45
-s ours am skip reason: change_id Iba5e727fc1a1adaf44a7fa1eebfefe34fa8644aa with SHA186a8e9b627
is in history Change-Id: I1a424edad11cbbeb87f6f4da9d50cefea4960bce
This commit is contained in: