Merge "Add BIND_CELL_BROADCAST_SERVICE permission"
am: 29cf01044a

Change-Id: I574b695a1d95231d2ad35d5c3015d7683f86e020