Fixup the visibility of CellBroadcast
(cherry picked from commit 413a08e8ddfee880f1555c06c1dc95262f21f2c0)