Merge "cellbroadcast provider refactor" am: 9ee562e0c6
am: 685a026082

Change-Id: I7f5acc47352a89f18a817d3d5ff2b1288cd09bbe