Merge "Cellbroadcast util lib"
am: 80e531234f

Change-Id: I0f410dbc0f0df09dbe3aa1a8fe88f68b6a8e2ca9