[automerger skipped] Merge "cellbroadcast provider refactor" am: 1abff4f0db am: 21c65d47cd
am: 4c135a2ae2 -s ours
am skip reason: change_id Id9ef1876b27bcae6b297be4cc24809239c202f6a with SHA1 a32c7fc398 is in history

Change-Id: I63be548f815cde88640710376e4225996143df55