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

Change-Id: I879e81e723b32263bd4a88f216704ef09298807c