Merge "Remove old CellBroadcastProvider" am: b5c86eb199
am: 9d8d038b8b

Change-Id: I664969b4ae22efac59596bedfe90964cd11bc625