Merge "Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected" into mm-wireless-dev