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

Change-Id: Ic14a8460db901e6bde3c76b41948a8678cffa439