Merge "atrace: add ufshcd_command event and change block events for disk category"