Merge "cellbroadcast provider refactor" am: 61119df4d4
am: 442fc2ae71

Change-Id: I3f2bc0d6de1f102e5f245be68b0662a87543b239