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