Merge "defconfig: sdm845: Enable VTI config for v4 and v6"