Merge "defconfig: sdm845: remove CONFIG_EXTCON" into msm-4.9