Merge "Revert "defconfig: msm: Enable CNSS SDIO for sdm845 perf mode""