[automerger skipped] Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"" am: 8172f45111 am: 21fedfab99 am: 87d2acb711
am: 96c51f58db -s ours
am skip reason: subject contains skip directive

Change-Id: I15041ac8c52514f80d4deaf78a54263d5daeac98