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

Change-Id: Ie961c40a8910877fff326609b0c80aa0dc10e0fe