Merge "mmc: block: Fix issue with deferred resume when CQ is enabled" into msm-4.9