Merge "mmc: cmdq_hci: Don't reset tag id on error path" into msm-4.9