[automerger skipped] Merge "Rename cellbroadcast's authority and fix permission check" am: 0eb00a9292 am: e5270b1659 am: a3c8632a83
am: 4f08428211 -s ours
am skip reason: change_id I9447cec0a261c790ac06e83a309268ceac4313df with SHA1 b7806e884a is in history

Change-Id: Iad668b337b6b753c315cc5fdff8384067d0de7c1