[automerger skipped] Merge "Add BIND_CELL_BROADCAST_SERVICE permission" am: 29cf01044a am: 22b5e71274 am: da6b65e648
am: faddc26b0a -s ours
am skip reason: change_id Iea2c5a6d6a7b7f888aaadc0b95c8677f4ec87779 with SHA1 a85ee68371 is in history

Change-Id: Ibae5ffbc644f0c48fce9b472a33d17f195ca9f35