Merge "Remove old CellBroadcastProvider"
am: b5c86eb199

Change-Id: I29e4ba6bfd25d6a6e16dd5c2fce076f4fff606f6