Merge "DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected" into mnc-dr1.5-dev
am: 06067b94b0

* commit '06067b94b092a3d6f422386bf3ec6d70771a5616':
  DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected