Merge "defconfig: msm: Enable CONFIG_MMC_CQ_HCI for sdm670"