[automerger skipped] Merge "Add fileds to Cellbroadcast" am: 071936e546 am: e5f84f5a70 am: 33f79cdfc2 am: ea52bc13ea -s ours
am: fc5c5abacf -s ours
am skip reason: change_id Ied0780cb1b9993e6d8cdb80131ba2f8b8affcb54 with SHA1 02cfb3bdc8 is in history

Change-Id: If0b2b56d4b595a7e7869a205b4b2c427f843270a