Merge "Separating phone and telecom specific protected broadcasts.  Bug: 23192492" into mnc-dev