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

Change-Id: I93805c4f89739c6e8ebd92fcd8f982b99174d676