Merge "cellbroadcast provider refactor"
am: 9ee562e0c6

Change-Id: Ibdaac42354701d42e6c3962150f2d0591ddf3384