Merge "Coresight: stm: Non-add data header based on diag entity ID"