Merge "Add CellBroadcastService and related permissions" am: 32382561a6
am: a2ca902d2f

Change-Id: I31ba9b8fdd540f07ccd88543c144a85c4eacc67b