Merge "USB: msm_otg: Increase data contact detection timeout"