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

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