Merge "cellbroadcast API cleanup"
am: 7d8e766d6d

Change-Id: I2c580be72e311fddae778ed82aa3f50d8e6cbe8d