[automerger skipped] Merge "Remove old CellBroadcastProvider" am: b5c86eb199 am: 9d8d038b8b
am: 2bb03f7dc8 -s ours
am skip reason: change_id Ie78cf392fc04a25e9283939194d6b5a42d9e31fd with SHA1 1e76db24be is in history

Change-Id: I7e430cb5557c3450d5e70edae26c3e5126f0f390