Merge "cellbroadcast provider refactor"
am: 61119df4d4

Change-Id: I003e0365287b8d3e5af30fb8250dddb97608325a