Merge "defconfig: msm: sync sdm670 with sdm845 configs"