Merge "defconfig: arm64: sdm845: Enable NFC driver" into msm-4.9