[automerger skipped] Initial move to CellBroadcastService dir am: c872fad4e4 am: 2af275da11
am: bf8c36b3a1 -s ours
am skip reason: change_id I34b4e8070d56c69d1ac799159bba085e387d768a with SHA1 dfcbfaf06b is in history

Change-Id: I4093b15617d19ea72bd21bf17506dfb775a8a5d7