[automerger skipped] Merge "Cellbroadcast util lib" am: 80e531234f am: 47a4b525f8 am: a19f5c24d5
am: 23a97352cc -s ours
am skip reason: change_id I247bfb3d877334fe822332275e37f015e10a566e with SHA1 4fea79cc58 is in history

Change-Id: Iaa40e89475112ca6115f983650cf085972171402