Merge "USB: Allow skipping device resume during system resume"