Revert "Separating phone and telecom specific protected broadcasts.  Bug: 23192492"

This reverts commit 39a8dcb58a6a1bf128bbdff7e1f183edb604a881.

Change-Id: Ide6f67a802db3d4e1eed24357810e1b38658567f
1 file changed