[automerger skipped] Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions" am: 6af905e0fe am: 09a3b50108 am: e74e608513
am: 33cf9d6cfe -s ours
am skip reason: subject contains skip directive

Change-Id: Ice5ac53cc8894844026ef5a03b6b433bea9cb45b