Merge "defconfig: arm64: Enable USB DIAG driver" into msm-4.8