Merge "cellbroadcast API cleanup" am: 7d8e766d6d
am: d1f5e7e789

Change-Id: I7452ae6bd51a36418fe4520153062c4de034104b