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

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