Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
am: 8172f45111

Change-Id: Ieed5df537d2b6ff40c8a6b2c2bd7c8ab090c2e9a