[automerger skipped] Merge "move CellBroadcastMessage from telephony-common to...
[automerger skipped] Merge "move CellBroadcastMessage from telephony-common to app" am: 7ccc5266 am: f0b78834 am: 20169d7a
am: 4ef47490 -s ours
am skip reason: change_id I6f2f977fc8570a69b902b75ab206ab5eb5210f8e with SHA1 55110243 is in history
Change-Id: Id14ac8bd7b2757a7a8b450db9ad2a96e34be10ea