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

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