[automerger skipped] Merge "cellbroadcast provider refactor" am: 61119df4d4 am: 442fc2ae71
am: efcfb006cf -s ours
am skip reason: change_id I2cf0d0314e5f0283e6bde71407a1d43d7373a2e7 with SHA1 fc0a165b8e is in history

Change-Id: Ic5d27e3a12179c4735a99e12cb917b5208a81d46