Merge "cellbroadcast provider refactor"
am: 1abff4f0db

Change-Id: I232020bb2f2bbc3a5083c2c7bc036b8f94e7ef6b