Merge "defconfig: msm8917: Disable ICNSS"