Merge "Rename cellbroadcast's authority and fix permission check" am: 0eb00a9292 am: e5270b1659
am: a3c8632a83

Change-Id: Ic0b7343c69f4beea89662b89825e6695ad75a429