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

* commit '16b8d8292370fb6511f74f6f94569ec4f060c26d':
  Separating phone and telecom specific protected broadcasts. Bug: 23192492