Merge "USB: OTG: msm: Implement data contact detection based on timeout" into msm-3.0