[automerger skipped] Merge "[DO NOT MERGE] Revert "Add BIND_CELL_BROADCAST_SERVICE permission"" am: 4cc4f606d6 am: 3de96c1a8c am: 2ceac1cd6f
am: 723e4f6be1 -s ours
am skip reason: subject contains skip directive

Change-Id: I870a7a2f49eda327c2f98192705d682cf8baa231