Merge "mmc: cmdq_hci: Add retry mechanism for cmdq_halt" into msm-4.9