Merge "Cellbroadcast util lib" am: 80e531234f
am: 47a4b525f8

Change-Id: Ib64248a9eaa6bb034e224b5bf89fa44239c359c7